OSDN Git Service
Glen Kuhne [Fri, 19 Feb 2016 21:39:41 +0000 (21:39 +0000)]
Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev
am:
70fc162330
* commit '
70fc1623301ab5268c54bb203329893893ed35cb':
Add EID_TIM to ScanResult.InformationElement
Glen Kuhne [Fri, 19 Feb 2016 21:35:09 +0000 (21:35 +0000)]
Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev
Adam Lesinski [Fri, 19 Feb 2016 20:53:31 +0000 (12:53 -0800)]
Remove extraneous field from batterystats dumpsys
Change-Id: Iea913e993e61d114c499e6218ad0abf9a8e80690
Diego Perez [Fri, 19 Feb 2016 20:18:28 +0000 (20:18 +0000)]
Merge "Revert "Fix Canvas memory leak"" into mnc-ub-dev
am:
44f92b00d1
* commit '
44f92b00d1a060773625de5884fc86e7218e2dd5':
Revert "Fix Canvas memory leak"
John Reck [Fri, 19 Feb 2016 20:11:54 +0000 (20:11 +0000)]
Merge "Temporarily enable fine-grained error checking" into nyc-dev
Diego Perez [Fri, 19 Feb 2016 20:09:08 +0000 (20:09 +0000)]
Merge "Revert "Fix Canvas memory leak"" into mnc-ub-dev
Diego Perez [Fri, 19 Feb 2016 20:07:44 +0000 (20:07 +0000)]
Revert "Fix Canvas memory leak"
This reverts commit
e82bd72b6e7ab3135d3b28fc2c2694d08af45c3d.
Change-Id: Ie9ef25b17d5f725d5054c039992a8cd2912868a6
Adrian Roos [Fri, 19 Feb 2016 19:53:19 +0000 (19:53 +0000)]
Merge "Use actual lockscreen wallpaper" into nyc-dev
Sudheer Shanka [Fri, 19 Feb 2016 19:31:44 +0000 (19:31 +0000)]
Merge "Part1 - Don't add padlock if the restriction is not set by admin." into nyc-dev
Adrian Roos [Thu, 11 Feb 2016 23:26:42 +0000 (15:26 -0800)]
Use actual lockscreen wallpaper
Bug:
25454162
Change-Id: I30ff02420bc4b72d7e4bf9105f2fd4c8017f5756
Sudheer Shanka [Thu, 11 Feb 2016 17:17:57 +0000 (17:17 +0000)]
Part1 - Don't add padlock if the restriction is not set by admin.
Bug:
26687435
Change-Id: I2fd740b1fa0d76eceedc4dde73e41d779820bbcf
Steve McKay [Fri, 19 Feb 2016 19:17:58 +0000 (19:17 +0000)]
Merge "Undo generalization isDownloads > supportsChildren." into nyc-dev
Julia Reynolds [Fri, 19 Feb 2016 19:17:23 +0000 (19:17 +0000)]
Merge "Remove Notification Topics." into nyc-dev
Glen Kuhne [Wed, 10 Feb 2016 23:08:33 +0000 (15:08 -0800)]
Add EID_TIM to ScanResult.InformationElement
Added EID_TIM to enable parsing of TrafficIndicationMap
InformationElements.
BUG=
25691077
Change-Id: I99450f0b720175660486da15d6b13affbdb61adc
Jason Monk [Fri, 19 Feb 2016 18:50:04 +0000 (18:50 +0000)]
Merge changes Ie427a2d8,I213f1f76 into nyc-dev
* changes:
SysUI Tuner: UI cleanup and grouping
SysUI Tuner: Night mode v3
Lajos Molnar [Fri, 19 Feb 2016 18:47:06 +0000 (18:47 +0000)]
Merge "media: expose audio sample format in MediaFormat" into nyc-dev
John Reck [Fri, 19 Feb 2016 18:39:17 +0000 (10:39 -0800)]
Temporarily enable fine-grained error checking
Bug:
27186019
Quick testing shows negligable performance impact, so turn
this on temporarily to track down some GL errors
Change-Id: I5700075d5640af0951d832acfde3179ec7511912
Mitchell Wills [Fri, 19 Feb 2016 18:22:51 +0000 (18:22 +0000)]
Merge "Fix FastXmlSerializerTest" into mm-wireless-dev
am:
3ca1ccb419
* commit '
3ca1ccb419ec56a191d724ff75c6943200c8cebe':
Fix FastXmlSerializerTest
Mitchell Wills [Fri, 19 Feb 2016 18:19:27 +0000 (18:19 +0000)]
Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev
am:
acd97e2e0f
* commit '
acd97e2e0fdcc50f20bc4836188e781583b10f1e':
Remove AsyncChannelTest because it does not test anything
Mitchell Wills [Fri, 19 Feb 2016 18:18:14 +0000 (18:18 +0000)]
Merge "DO NOT MERGE Disable failing test case" into mm-wireless-dev
am:
9272fd8f4c -s ours
* commit '
9272fd8f4c74384927ad6502c57153bf188a66ea':
DO NOT MERGE Disable failing test case
Sudheer Shanka [Fri, 19 Feb 2016 18:15:32 +0000 (18:15 +0000)]
Merge "Update string used as summary when an option is disabled by policy." into nyc-dev
Mitchell Wills [Fri, 19 Feb 2016 18:13:58 +0000 (18:13 +0000)]
Merge "Fix FastXmlSerializerTest" into mm-wireless-dev
Mitchell Wills [Fri, 19 Feb 2016 18:11:20 +0000 (18:11 +0000)]
Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev
Mitchell Wills [Fri, 19 Feb 2016 18:10:54 +0000 (18:10 +0000)]
Merge "DO NOT MERGE Disable failing test case" into mm-wireless-dev
Diego Perez [Fri, 19 Feb 2016 18:08:00 +0000 (18:08 +0000)]
Merge "Fix Canvas memory leak" into mnc-ub-dev
am:
bad0e07ee9
* commit '
bad0e07ee9163d6b0f0bf73ad591ff6e453199ef':
Fix Canvas memory leak
Diego Perez [Fri, 19 Feb 2016 17:58:16 +0000 (17:58 +0000)]
Merge "Fix Canvas memory leak" into mnc-ub-dev
Diego Perez [Mon, 1 Feb 2016 11:48:16 +0000 (11:48 +0000)]
Fix Canvas memory leak
Every RenderSession would call the AttachInfo.setAttachInfo but wouldn't
issue a View.dispatchDetachedFromWindow.
This caused some Canvas to be slowly leaked in the DelegateManager in
every session.
Change-Id: I0322767e5fffc6053ce1be852dd8ca904dfaa137
Svetoslav Ganov [Fri, 19 Feb 2016 17:12:39 +0000 (17:12 +0000)]
Merge "Don't hold a lock while reading shared preferences from disk." into nyc-dev
Svet Ganov [Fri, 19 Feb 2016 17:05:04 +0000 (09:05 -0800)]
Don't hold a lock while reading shared preferences from disk.
Shared prefrences loads thir content from disk on a separate
thread to improve performance, however it holds the lock
the whole time while reading from disk which as a result blocks
operations that don't rely on reading data from being performed
intil load completes, e.g. reguistering a prefernces change
listener does not depend on having the data loaded.
bug:
5254577
Change-Id: I5ad67b285631c34d5aadac7138ba8bfaa728cf94
Yohei Yukawa [Fri, 19 Feb 2016 16:04:58 +0000 (16:04 +0000)]
Merge "Reset IMMS when the device is unlocked." into nyc-dev
Geoff Mendal [Fri, 19 Feb 2016 15:33:53 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Fri, 19 Feb 2016 15:31:25 +0000 (07:31 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
27213136
Bug:
27262078
Change-Id: If76097a0645fbc162dd35af9d74e1ac42a21c9f5
Paul Stewart [Fri, 19 Feb 2016 15:29:04 +0000 (15:29 +0000)]
Properly map EAP-GTC for TTLS
am:
274042519d
* commit '
274042519d84ad837f03572865bc096a537c73fb':
Properly map EAP-GTC for TTLS
Paul Stewart [Sat, 16 Jan 2016 02:56:52 +0000 (18:56 -0800)]
Properly map EAP-GTC for TTLS
The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant. Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.
This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.
Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal. All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.
In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.
Bug:
26400915
Change-Id: I866e2f77ad53d9a51c5f61acb9adef522661f721
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
Ben Wagner [Fri, 19 Feb 2016 15:03:47 +0000 (15:03 +0000)]
Merge "Use UTF32 directly in HarfBuzz<->Skia interface." into nyc-dev
Kenny Guy [Fri, 19 Feb 2016 14:40:06 +0000 (14:40 +0000)]
Merge "Allow widget hosts to see widgets from locked profiles." into nyc-dev
Kenny Guy [Mon, 15 Feb 2016 19:04:31 +0000 (19:04 +0000)]
Allow widget hosts to see widgets from locked profiles.
Avoid launchers removing widgets by handling case
where a widget host is in an unlocked parent user and
widget providers are in a locked managed profile.
For this case allow launcher to see the widgets from
non-crypto aware widget providers.
Mask out widgets from locked profiles.
Fix issue with widgets not being masked when adding
new widgets when user is locked / quiet or package
is suspended.
Bug:
26721345
Bug:
27037962
Change-Id: I60b5bd934c1547110e374ab4eefbee6aade37dc6
Narayan Kamath [Fri, 19 Feb 2016 13:46:37 +0000 (13:46 +0000)]
Merge "Track libcore commit
aaebe4e16c487da7555cd230265acc211389781d." into nyc-dev
Narayan Kamath [Fri, 19 Feb 2016 11:41:27 +0000 (11:41 +0000)]
Track libcore commit
aaebe4e16c487da7555cd230265acc211389781d.
bug:
27186457
Change-Id: Ibd7d246893d9a97c8eea0e80d181cf2a5313b2d3
Lenka Trochtova [Wed, 17 Feb 2016 12:55:17 +0000 (13:55 +0100)]
Allow ephemeral users on the split-system-user systems only.
BUG:
27143201
Change-Id: I37f3ca7366648dbf07df39a7a972857e0ff78a9a
Esteban Talavera [Fri, 19 Feb 2016 09:37:22 +0000 (09:37 +0000)]
Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev
Wei Wang [Fri, 19 Feb 2016 09:27:19 +0000 (09:27 +0000)]
Merge "Add Java API for secure RTT protocol." into mm-wireless-dev
am:
0db6066c7b
* commit '
0db6066c7b0583610769fb0f9bc80ceafedefb75':
Add Java API for secure RTT protocol.
Wei Wang [Fri, 19 Feb 2016 09:22:44 +0000 (09:22 +0000)]
Merge "Add Java API for secure RTT protocol." into mm-wireless-dev
Toby Sargeant [Fri, 19 Feb 2016 09:14:55 +0000 (09:14 +0000)]
Merge "add developer setting for multiprocess webview" into nyc-dev
Mitchell Wills [Fri, 19 Feb 2016 06:57:10 +0000 (22:57 -0800)]
DO NOT MERGE Disable failing test case
Bug:
27258801
Change-Id: I832505e0feca9f0abbf627d009d5982a4437bf83
Mitchell Wills [Fri, 19 Feb 2016 07:43:30 +0000 (23:43 -0800)]
Fix FastXmlSerializerTest
Change-Id: Ie984abae588927e65bdeffa5a6f5c58bd6ba0bf1
Mitchell Wills [Fri, 19 Feb 2016 07:37:14 +0000 (23:37 -0800)]
Remove AsyncChannelTest because it does not test anything
Change-Id: I7d3fe580a8c32ef3bd10895b51a7fc436f79919f
Lorenzo Colitti [Fri, 19 Feb 2016 06:08:15 +0000 (06:08 +0000)]
Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev
am:
5947d11119
* commit '
5947d11119d2ca1426d358a6850bd5a8d8490ab5':
Move tests for com.android.internal.util out of coretests
Lorenzo Colitti [Fri, 19 Feb 2016 06:04:25 +0000 (06:04 +0000)]
Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev
Mitchell Wills [Fri, 19 Feb 2016 05:56:04 +0000 (05:56 +0000)]
Merge "DO NOT MERGE Add a new WakeupMessage class" into mm-wireless-dev
am:
019fb9f4e4 -s ours
* commit '
019fb9f4e419da4aacfac17ea89112a2f410ecf5':
DO NOT MERGE Add a new WakeupMessage class
Lorenzo Colitti [Fri, 19 Feb 2016 04:32:30 +0000 (13:32 +0900)]
Move tests for com.android.internal.util out of coretests
These are very simple tests with no dependencies, and moving them
out of FrameworksCoreTests makes it possible to iterate much more
quickly. "runtest frameworks-core" takes almost a minute just to
push to the device, before any tests even start running.
Bug:
25691379
Change-Id: I8d99316a5940e0171883b97c578f9a6882b699a0
Mitchell Wills [Fri, 19 Feb 2016 05:33:36 +0000 (05:33 +0000)]
Merge "DO NOT MERGE Add a new WakeupMessage class" into mm-wireless-dev
Lorenzo Colitti [Fri, 19 Feb 2016 05:01:56 +0000 (05:01 +0000)]
Add a MessageUtils class to convert int constants to strings.
am:
d2457a3ee3
* commit '
d2457a3ee39ea55ed8e302bd93feede793cb5055':
Add a MessageUtils class to convert int constants to strings.
Svetoslav Ganov [Fri, 19 Feb 2016 04:03:49 +0000 (04:03 +0000)]
Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev
Svet Ganov [Fri, 19 Feb 2016 04:02:36 +0000 (20:02 -0800)]
Improve requestPermissions API docs and throw correct exception.
bug:
26220898
Change-Id: Iebda3fe13b963b10829de917fb00a9a14186b72c
Chong Zhang [Fri, 19 Feb 2016 02:57:36 +0000 (02:57 +0000)]
Merge "Schedule stop immediately when activity is invisible and done pausing" into nyc-dev
Chong Zhang [Fri, 19 Feb 2016 01:53:57 +0000 (17:53 -0800)]
Schedule stop immediately when activity is invisible and done pausing
bug:
27174050
Change-Id: Ie0bf3b4e6954a72bfa7f5d1066406ac021284b8a
Allen Hair [Fri, 19 Feb 2016 02:45:29 +0000 (02:45 +0000)]
Merge "Limit modal windows to only hide windows in the same task." into nyc-dev
Chris Tate [Fri, 19 Feb 2016 02:41:56 +0000 (02:41 +0000)]
Merge "Don't try to register (and invoke!) intentional null callbacks" into nyc-dev
Christopher Tate [Fri, 19 Feb 2016 02:39:19 +0000 (18:39 -0800)]
Don't try to register (and invoke!) intentional null callbacks
Change-Id: Iccb9df242a4d6c3aea03be9132f83afb70be0397
Yohei Yukawa [Fri, 19 Feb 2016 02:36:48 +0000 (02:36 +0000)]
Merge "Introduce InputConnection#getHandler()." into nyc-dev
Steve McKay [Fri, 19 Feb 2016 02:36:21 +0000 (02:36 +0000)]
Merge "Escape title of Operationdialog." into nyc-dev
Tim Murray [Fri, 19 Feb 2016 02:29:49 +0000 (02:29 +0000)]
Merge "Fix TOP_APP description in dumpsys activity." into nyc-dev
Andreas Gampe [Fri, 19 Feb 2016 02:13:51 +0000 (02:13 +0000)]
Merge "Frameworks/base: Preloaded classes for N" into nyc-dev
Lorenzo Colitti [Wed, 2 Dec 2015 08:51:28 +0000 (17:51 +0900)]
DO NOT MERGE Add a new WakeupMessage class
This is useful when using the new AlarmManager direct callback
interface to wake up the system and request that an object whose
API consists of messages (such as a StateMachine) perform some
action.
In this situation, using AlarmManager.onAlarmListener by itself
will wake up the system to send the message, but does not
guarantee that the system will be awake until the target object
has processed it. This is because as soon as the onAlarmListener
sends the message and returns, the system is free to go to sleep
again.
Bug:
20157436
Bug:
25823676
Cherry-picked WakeupMessage.java from
9d3aadb24778cc36a350a04b088d2ed7ee3790e1
Change-Id: Idff20029d287f26347441a2523b7fb20eda6a8b0
Jorim Jaggi [Thu, 18 Feb 2016 06:13:43 +0000 (22:13 -0800)]
Do not put floating windows into drag resize mode
Not really useful and creates a lot of "jank".
Bug:
27099358
Change-Id: Id1c5e09cc9731f64c5f52f9c187ccbda468ea26e
Andreas Gampe [Thu, 18 Feb 2016 21:58:09 +0000 (13:58 -0800)]
Frameworks/base: Preloaded classes for N
Update the preloaded-classes list for Android N.
Bug:
27248115
Change-Id: Iaf726fa318a4495a5af57d2845a427095bc5f831
Lorenzo Colitti [Wed, 17 Feb 2016 15:32:44 +0000 (00:32 +0900)]
Add a MessageUtils class to convert int constants to strings.
This class uses reflection to find accessible static integer
members in a specified list of classes and returns a SparseArray
mapping the integers to their names. This will allow us to
replace various 400-line switch statements with a simple
array access.
Change-Id: I3607e6389a423cde0bd83270c00b3c863ae1bb29
Ben Kwa [Fri, 19 Feb 2016 00:52:24 +0000 (00:52 +0000)]
Merge "Renumber UMA constants." into nyc-dev
Ben Kwa [Thu, 18 Feb 2016 00:06:22 +0000 (16:06 -0800)]
Renumber UMA constants.
Clearcut does not like negative or zero values for its histograms.
Also, consolidate all metrics constants in the Metrics.java file. In
cases where values are being obtained from elsewhere (e.g. State.action
constants), map those constants to constants defined in Metrics.java.
This will reduce occurrences of constants changes accidentally screwing
up metrics data.
BUG=
26737132
Change-Id: Ia9fb88a49c3102afc2464d20653e2ee21cfc591f
Ben Kwa [Fri, 19 Feb 2016 00:39:26 +0000 (00:39 +0000)]
Merge "Implement type-to-focus in the DirectoryFragment." into nyc-dev
Makoto Onuki [Fri, 19 Feb 2016 00:21:47 +0000 (00:21 +0000)]
Merge "Clean up on UserManagerService and DPMS" into nyc-dev
Abhijith Shastry [Fri, 19 Feb 2016 00:21:15 +0000 (00:21 +0000)]
Merge "Make BlockSuppressalStatus constructor public so that it can be constructed by the provider." into nyc-dev
Makoto Onuki [Thu, 18 Feb 2016 22:25:30 +0000 (14:25 -0800)]
Clean up on UserManagerService and DPMS
- Avoid the ART warning about 4.1 compatibility
- Avoid integer overflow in DPMS
Bug
27243525
Bug
27242859
Change-Id: I92af323287e348fbd0eff31e6cf9823be8e41024
Abhijith Shastry [Fri, 19 Feb 2016 00:15:58 +0000 (16:15 -0800)]
Make BlockSuppressalStatus constructor public so that it can be constructed by the provider.
BUG:
26989170
Change-Id: I9fae7fc03b34b4081c7096eb13fa38737b52efe6
Steve McKay [Fri, 19 Feb 2016 00:08:36 +0000 (16:08 -0800)]
Escape title of Operationdialog.
Security review feedback.
Bug:
27121721
Change-Id: Ibafa07aea7b2f77ca476e4f62bd5e4e556ba49c7
Etan Cohen [Fri, 19 Feb 2016 00:00:30 +0000 (00:00 +0000)]
[NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]
am:
0d0f0c7faf -s ours
* commit '
0d0f0c7faf530a0fa5595dd539c3f56afeb6603a':
[NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]
Steve McKay [Thu, 18 Feb 2016 23:32:16 +0000 (15:32 -0800)]
Undo generalization isDownloads > supportsChildren.
Move root comparison logic into RootInfo.
Move shared string comparison code to Shared.
Change-Id: I3267b496a165ad3cae773783db0e79df2eb118e8
Etan Cohen [Thu, 18 Feb 2016 23:58:39 +0000 (23:58 +0000)]
[NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]
am:
e4c50de752 -s ours
* commit '
e4c50de75273efaec4e9e8db6174e0bfc07d3105':
[NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]
Dongwon Kang [Thu, 18 Feb 2016 23:54:50 +0000 (23:54 +0000)]
Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev
Etan Cohen [Thu, 18 Feb 2016 23:53:07 +0000 (23:53 +0000)]
NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]
am:
aa36f07194 -s ours
* commit '
aa36f07194b29adee881e684b63f8bbdee6097bc':
NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]
Etan Cohen [Thu, 18 Feb 2016 00:01:49 +0000 (16:01 -0800)]
[NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]
The interfaces had multiple functions and are hence callback
and not a listener.
Note: purely a rename operation.
Bug:
27122760
Change-Id: Ib12711f56a64052455843859125d72268c465fc0
Etan Cohen [Wed, 17 Feb 2016 22:25:41 +0000 (14:25 -0800)]
[NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]
Simplify configuration and consolidate structures whose difference
wasn't very clear.
Bug:
27122760
Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de
Adam Powell [Thu, 18 Feb 2016 23:44:14 +0000 (23:44 +0000)]
Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev
Dongwon Kang [Thu, 18 Feb 2016 22:16:15 +0000 (14:16 -0800)]
TIF: Unhide TvContract.Programs.Genres#isCanonical
Bug:
25726917
Change-Id: I8717b1c9f39f8b5b9196658c1501d5abf2337eb9
Yohei Yukawa [Wed, 17 Feb 2016 15:57:25 +0000 (07:57 -0800)]
Reset IMMS when the device is unlocked.
With File-Based Encryption (FBE), now we have yet another runteime event
to reset IMMS state in order to keep the list of available IMEs updated
and make sure one IME is enabled. Here is the full list of such runtime
events.
1. Boot phase reaches SystemService.PHASE_ACTIVITY_MANAGER_READY.
2. One or more packages that contain InputMethodService are updated.
3. The current user is switched.
4. The device locale is changed.
5. The device is unlocked by the current user.
Now we are adding the rule 5 in this CL.
We also apply Copy-On-Write (COW) settings mode, which was added in a
recent commit [1], until the deivice is unlocked. This allows us to
temporarily update the settings when the device is locked, without
messing up actual SecureSettings.
[1] I9c6f9bb3d51174198e5f73588637f87ea0d90e11
Here are some examples of what users would see in FBE-enabled devices.
Suppose we have following 5 IMEs installed.
- IME A: Encryption Aware, pre-installed, ASCII-capable
- IME B: Encryption Unaware, pre-installed, ASCII-capable
- IME C: Encryption Unaware, not pre-installed, ASCII-capable
- IME D: Encryption Aware, not pre-installed, ASCII-capable
Case 1)
Before boot:
Enabled: IME A
Selected: IME A
Device Locked:
Available: IME A, IME D
Enabled: IME A
Selected: IME A
Device Unolcked:
Available: IME A, IME B, IME C, IME D
Enabled: IME A
Selected: IME A
Case 2)
Before boot:
Enabled: IME A, IME B
Selected: IME B
Device Locked:
Available: IME A, IME D
Enabled: IME A
Selected: IME A
Device Unolcked:
Available: IME A, IME B, IME C, IME D
Enabled: IME A, IME B
Selected: IME B
Case 3)
Before boot:
Enabled: IME B, IME C
Selected: IME B
Device Locked:
Available: IME A, IME D
Enabled: IME A
Selected: IME A
Device Unolcked:
Available: IME A, IME B, IME C, IME D
Enabled: IME B, IME C
Selected: IME B
Note: in this case, IMMS can rely on an existing rule to support
the situation where enabled/selected IMEs were already uninstalled.
Case 4)
Before boot:
Enabled: IME B, IME C, IME D
Selected: IME B
Device Locked:
Available: IME A, IME D
Enabled: IME D
Selected: IME D
Device Unolcked:
Available: IME A, IME B, IME C, IME D
Enabled: IME B, IME C, IME D
Selected: IME B
Following things should be taken care of subsequent CLs.
- Add CTS to ensure that at least one encryption-aware IME is
pre-installed if the device supports FBE.
- Consider an accidental case where there is no encryption-aware IME.
This includes the case where all the encryption-aware system IMEs are
overwritten by encryption-unaware IMEs that have higher versions.
Bug:
26279466
Change-Id: Ifa2225070bf8223f8964cf063c86889e312c5e9a
Chong Zhang [Thu, 18 Feb 2016 23:24:47 +0000 (23:24 +0000)]
Merge "Make sure mExiting is cleared when app is set to visible" into nyc-dev
Allen Hair [Fri, 12 Feb 2016 01:42:59 +0000 (17:42 -0800)]
Limit modal windows to only hide windows in the same task.
Bug:
26560078
Change-Id: Ic3bd8d06ed0d8d44a8e7f0faaba31a762a9bfef3
Keisuke Kuroyanagi [Thu, 18 Feb 2016 23:19:43 +0000 (23:19 +0000)]
Merge "Optimize: Use measureText instead of doLayout." into nyc-dev
Adam Powell [Thu, 18 Feb 2016 23:17:29 +0000 (15:17 -0800)]
Fix NPE for Fragment#setUserVisibleHint(true)
Fix a bug where calling setUserVisibleHint(true) before adding a
Fragment to a FragmentManager could cause a crash.
Bug
27250018
Change-Id: Id192ae31bab95f15d32de9f105e707bdb8691641
Yohei Yukawa [Thu, 18 Feb 2016 23:16:04 +0000 (23:16 +0000)]
Merge "Stop granting default Contacts permission to IMEs." into nyc-dev
Adam Powell [Thu, 18 Feb 2016 23:13:37 +0000 (23:13 +0000)]
Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice" into nyc-dev
Aurimas Liutikas [Thu, 18 Feb 2016 23:09:46 +0000 (23:09 +0000)]
Merge "Suppressed unused parameter warnings in frameworks/base/tests/Camera2Tests" into nyc-dev
Steve McKay [Thu, 18 Feb 2016 23:08:26 +0000 (23:08 +0000)]
Merge "UX cleanups." into nyc-dev
Christopher Tate [Wed, 10 Feb 2016 20:59:49 +0000 (12:59 -0800)]
Keyguard wallpaper
Clients can now set a lock-only wallpaper that Keyguard can
observe and choose to draw as appropriate.
Bug
25454162
Change-Id: I3fc30e02919e814b55dfded2a1a36ad9d2e55299
Ben Kwa [Thu, 18 Feb 2016 22:57:17 +0000 (22:57 +0000)]
Merge "Implement backspace support." into nyc-dev
Amith Yamasani [Thu, 18 Feb 2016 22:36:03 +0000 (22:36 +0000)]
Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev am:
7a313a63ca am:
6aff10d066 -s ours
am:
ba32b162a3 -s ours
* commit '
ba32b162a345f38b7df658b742e76daabb670645':
DO NOT MERGE Check apps idle states on time changes
Tim Murray [Thu, 18 Feb 2016 22:30:41 +0000 (14:30 -0800)]
Fix TOP_APP description in dumpsys activity.
bug
27187310
Change-Id: I65ae24ba04ab3d13ca2fc9ba4088e57d8935b924
Ben Kwa [Wed, 17 Feb 2016 18:48:57 +0000 (10:48 -0800)]
Implement backspace support.
Pressing backspace pops the user up a directory level if they aren't at
the root directory of the current root.
BUG=
27123794
Change-Id: I8f0a88a1194bf8f082d0b057a288a0c3da3068f6
Chong Zhang [Thu, 18 Feb 2016 20:39:13 +0000 (12:39 -0800)]
Make sure mExiting is cleared when app is set to visible
Reset mExiting even if we are not going to do enter animation.
Also make sure has surface state is set correctly if restoring.
bug:
27235356
Change-Id: Ie6e78baefc8242015ed9c37ab221c39860682ab2