Jeff Sharkey
a5b5bfbbef
am 5b4350f2: Merge "Fix memory leak in ManageApplication"
...
* commit '5b4350f22f81662436992504e711e462de7a790f':
Fix memory leak in ManageApplication
2014-02-06 22:31:26 +00:00
Jeff Sharkey
5b4350f22f
Merge "Fix memory leak in ManageApplication"
2014-02-06 22:25:30 +00:00
Amith Yamasani
8052091f46
am aea431f2: am f6971ee1: am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'aea431f24bc19cc24530cee4db01033f8503a67d':
Remove unused DebugIntentSender
2014-02-05 20:46:37 +00:00
Amith Yamasani
aea431f24b
am f6971ee1: am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'f6971ee1d52a0e258fa60306b07cb8348d88baf8':
Remove unused DebugIntentSender
2014-02-05 20:43:52 +00:00
Amith Yamasani
f6971ee1d5
am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '454df35ee323ec9ca21b0c1ed982eba263df70e3':
Remove unused DebugIntentSender
2014-02-05 20:40:39 +00:00
Amith Yamasani
3c4603ef1c
am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '8f9482170835059c11cffa9c554191306db49fbd':
Remove unused DebugIntentSender
2014-02-05 20:35:24 +00:00
Amith Yamasani
8f94821708
am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
Remove unused DebugIntentSender
2014-02-05 12:33:48 -08:00
Amith Yamasani
0ad774458a
am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
2014-02-05 11:52:23 -08:00
Amith Yamasani
7c0ada6554
am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
2014-02-05 11:27:30 -08:00
Amith Yamasani
0fce6123bd
am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
2014-02-05 11:15:01 -08:00
Amith Yamasani
7a2d8bd4b0
am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
2014-02-05 11:09:40 -08:00
Amith Yamasani
49d502a45d
am c7843db0: Remove unused DebugIntentSender
...
* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
2014-02-05 11:04:25 -08:00
Amith Yamasani
c7843db06c
Remove unused DebugIntentSender
...
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4 )
2014-02-04 23:48:05 +00:00
Brian Carlstrom
0105c00519
am f2e9be9a: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
2014-01-31 13:00:33 +00:00
Brian Carlstrom
7a60db234a
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
...
Bug: 12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
2014-01-30 13:17:08 -08:00
John Spurlock
af87ce0991
am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
...
* commit '041192855ed8b025246578d80f0b372bf346a2f1':
'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:48:12 +00:00
John Spurlock
cb8a53541e
am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
...
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:40:45 +00:00
Per Allard
6251d707b1
'When to daydream' dialog does not follow the JB dialog design guide
...
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.
Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
2014-01-23 18:15:56 +09:00
Wei Wang
f4f8d9f346
BLE peripheral mode (4/4): Settings change for advertising preference.
...
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-14 18:06:42 -08:00
Jun Su
f3a9578910
Fix memory leak in ManageApplication
...
ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.
Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
2014-01-14 03:47:01 +00:00
Jeff Sharkey
859909fee8
am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
...
* commit 'b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
Fix null pointer exceptions in NetworkPolicyEditor
2014-01-10 15:08:40 -08:00
Jeff Sharkey
b5377a7165
Merge "Fix null pointer exceptions in NetworkPolicyEditor"
2014-01-10 23:04:31 +00:00
Amith Yamasani
e7d8485a23
am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
...
* commit '5be77489e2f1f7b5c68763cf7660e844587d5e9e':
Dont show "Erase SD Card" when there is none
2014-01-07 10:42:15 -08:00
Amith Yamasani
5be77489e2
Merge "Dont show "Erase SD Card" when there is none"
2014-01-07 18:37:54 +00:00
Elliott Hughes
97886741b9
am f85d9841: Merge "Fix elapsed time formatting."
...
* commit 'f85d9841f8e198de656973a2102d3239e628390a':
Fix elapsed time formatting.
2014-01-03 13:36:27 -08:00
Elliott Hughes
f7cb4b0dda
Fix elapsed time formatting.
...
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.
Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
2014-01-03 12:14:13 -08:00
Johan Redestig
5517ad92dd
Dont show "Erase SD Card" when there is none
...
On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:
Card present and mounted -> Erase enabled
Card present but unmounted -> Erase enabled
No card present -> Erase disabled
Card present and MTP attached -> Erase disabled
Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
2013-12-19 10:47:17 +01:00
Behrooz Aliabadi
524dee0fb5
Fix null pointer exceptions in NetworkPolicyEditor
...
This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.
Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
2013-12-18 09:55:45 +00:00
Kenny Root
ef2f97c70e
am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
...
* commit 'e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
Use java.util.Objects instead of internal API
2013-12-13 13:58:59 -08:00
Kenny Root
7440dde808
Use java.util.Objects instead of internal API
...
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
2013-12-13 13:28:33 -08:00
The Android Open Source Project
b568548747
Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD
2013-12-05 12:38:23 -08:00
Amith Yamasani
ff0fad2a06
am e10f8528: Merge "Fix switching running/cached apps with memory bar"
...
* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
Fix switching running/cached apps with memory bar
2013-12-04 13:05:17 -08:00
Amith Yamasani
e10f852822
Merge "Fix switching running/cached apps with memory bar"
2013-12-04 19:17:33 +00:00
Amith Yamasani
ab747c87a9
am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
Put fragment in specific activity's whitelist
2013-12-03 11:38:00 -08:00
Lorenzo Colitti
5613086bdb
am 540d26e8: Merge "Dynamically update connectivity and IP address."
...
* commit '540d26e8449159ebc2d84b8062f20ab4c6337f77':
Dynamically update connectivity and IP address.
2013-11-26 08:38:50 -08:00
Lorenzo Colitti
d393e7cbab
am 20ab234f: Merge "Cache preferences and services in status dialog."
...
* commit '20ab234f3d8ecdcbae2c998ded48ebf022ffa963':
Cache preferences and services in status dialog.
2013-11-26 08:38:49 -08:00
Amith Yamasani
a88bdd34f7
Put fragment in specific activity's whitelist
...
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
2013-11-25 11:10:00 -08:00
Lorenzo Colitti
5448b25481
Dynamically update connectivity and IP address.
...
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.
For consistency, also update the advanced wifi settings page.
[Cherry-pick of deb8f08ace ]
Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
2013-11-25 17:34:45 +09:00
Lorenzo Colitti
b088c8a7c7
Cache preferences and services in status dialog.
...
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.
In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.
[Cherry-pick of 6eb6a90821 ]
Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
2013-11-25 17:34:08 +09:00
The Android Open Source Project
ca99cb71ea
Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD
2013-11-22 10:35:36 -08:00
Jeff Brown
169e8a0c2a
am 017d2a18: am 130118d4: Add help url for remote display.
...
* commit '017d2a189ac758ad035182a886c4f4e578cee6f2':
Add help url for remote display.
2013-11-18 19:09:55 -08:00
Jeff Brown
130118d436
Add help url for remote display.
...
Bug: 11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
2013-11-18 17:58:08 -08:00
Svetoslav
03360cd239
am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
...
* commit '196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
Show correct message for a print job that is being canceled.
2013-11-14 22:30:53 -08:00
Svetoslav
e7b781f574
Merge "Show correct message for a print job that is being canceled." into klp-dev
2013-11-15 06:23:54 +00:00
Svetoslav
97e962cd36
Show correct message for a print job that is being canceled.
...
1. If a print job is being canceled we now show appropriate
message that matches what the notification shows.
2. If a print job is being canceled we do not show the cancel
button.
bug:11696928
Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
2013-11-14 18:15:19 -08:00
Jim Miller
f75a736a3e
am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper
...
* commit '31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
Don't show keyguard on top of CryptKeeper
2013-11-14 16:29:39 -08:00
Jim Miller
fb3d5cad48
Don't show keyguard on top of CryptKeeper
...
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.
CryptKeeper itself should explicitly dismiss keyguard.
Fixes bug 11680832
Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
2013-11-14 14:40:22 -08:00
David Christie
9605791d41
am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
...
* commit '7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 14:20:31 -08:00
David Christie
b1ded62f3f
Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
2013-11-14 20:12:42 +00:00
Jeff Brown
0df39f39fc
am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
...
* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
Integrate remote display routes into screen cast settings UI.
2013-11-11 10:27:24 -08:00