OSDN Git Service
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
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]
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
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
Andreas Gampe [Thu, 18 Feb 2016 22:26:12 +0000 (22:26 +0000)]
Merge "Frameworks/base: Use Log.printlns in RuntimeInit" into nyc-dev
Amith Yamasani [Thu, 18 Feb 2016 22:21:32 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev am:
7a313a63ca
am:
6aff10d066 -s ours
* commit '
6aff10d0662bc4c7e64a2e6d22f3606ef4dd1046':
DO NOT MERGE Check apps idle states on time changes
Steve McKay [Thu, 18 Feb 2016 17:48:39 +0000 (09:48 -0800)]
UX cleanups.
Visually separate directory background from sidebar.
Lower shadows so the "real" effect isn't so prominent.
Hitchhikders:
Consolidate bool values in config.xml files (were in dimens.xml).
Add missing supportsRecents & supportsSearch methods
to RootInfo.
Rename RecentLoader to RecentsLoader so it doesn't defy
searching for "Recents" string.
Move Downloads below the divider.
Change-Id: I06c76e26ec6df6541860a1448865c67ed953ed43
Ben Wagner [Thu, 18 Feb 2016 22:20:17 +0000 (17:20 -0500)]
Use UTF32 directly in HarfBuzz<->Skia interface.
This fixes a TODO to use kUTF32_TextEncoding directly. This avoids
encoding UTF32 codepoints from HarfBuzz into UTF16 to pass to Skia,
which will then re-decode to UTF32. This also removes a use of
SkUtils.h which Skia desires to move to private use.
Change-Id: I087f4216c25f7874e496920cd33e2f109530c397
Wale Ogunwale [Thu, 18 Feb 2016 22:13:05 +0000 (22:13 +0000)]
Merge "Protect against surfaceController and hasSurface getting out of sync." into nyc-dev
Adam Lesinski [Thu, 18 Feb 2016 22:12:23 +0000 (22:12 +0000)]
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle am:
1559fed4c4 -s ours am:
5c9378f310 -s ours
am:
d828c95a93 -s ours
* commit '
d828c95a930c6789f6251bc8a120bf2293a3a22e':
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
Adam Lesinski [Thu, 18 Feb 2016 22:09:57 +0000 (22:09 +0000)]
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash am:
2bd90c6abc -s ours am:
bca4317a3b -s ours
am:
f2fd47bfa5 -s ours
* commit '
f2fd47bfa5533bb9e57b37760edde71776048c88':
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
Adam Lesinski [Thu, 18 Feb 2016 22:08:28 +0000 (22:08 +0000)]
Merge branch 'nyc-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev
Adam Lesinski [Thu, 18 Feb 2016 22:07:23 +0000 (22:07 +0000)]
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time am:
9c7b543325 -s ours am:
7e03454985 -s ours
am:
78a2522c7f -s ours
* commit '
78a2522c7f02570f36a3683a9ba5cfa813abc26e':
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
Jeff Sharkey [Thu, 18 Feb 2016 22:07:04 +0000 (22:07 +0000)]
Merge "Push mapping of package name to appId to kernel." into nyc-dev
Aurimas Liutikas [Thu, 18 Feb 2016 19:25:48 +0000 (11:25 -0800)]
Suppressed unused parameter warnings in frameworks/base/tests/Camera2Tests
Bug:
27149500
Change-Id: I3e522d58db88d2933ae82f6f448a8671316b0b35
Adam Lesinski [Thu, 18 Feb 2016 22:03:35 +0000 (22:03 +0000)]
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle am:
1559fed4c4 -s ours
am:
5c9378f310 -s ours
* commit '
5c9378f310acd4ab375ed8a5d703a86522ab814c':
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
Andreas Gampe [Thu, 18 Feb 2016 22:01:41 +0000 (14:01 -0800)]
Frameworks/base: Use Log.printlns in RuntimeInit
Make printlns in Log public-@hide so it can be used.
Print uncaught exceptions that will terminate the process in
RuntimeInit using printlns, so that long exception traces are not
being truncated.
Bug:
27245306
Change-Id: Ib24635f0ebdd80bd125e367302cab6a78e6a210a
Jeff Sharkey [Tue, 2 Feb 2016 00:57:08 +0000 (17:57 -0700)]
Push mapping of package name to appId to kernel.
The new sdcardfs kernel driver needs to know this mapping for
deriving UID permissions, so push the data through /config when
supported by the kernel. This also has the nice benefit of letting
us push only the deltas of what actually changes, instead of
re-parsing the entire "packages.list" file.
The mappings for newly installed apps are pushed before the app is
allowed to run, removing some latent race conditions. Also cleans
up stale mappings when packages are uninstalled, and whenever the
system server reboots.
Bug:
19160983
Change-Id: Iace92efb69616c96b34c0d9d911e4b54e5fd8a67
Adam Lesinski [Thu, 18 Feb 2016 22:00:55 +0000 (22:00 +0000)]
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash am:
2bd90c6abc -s ours
am:
bca4317a3b -s ours
* commit '
bca4317a3bbbdfdda083283d73a26e9c078c84f2':
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
Adam Lesinski [Thu, 18 Feb 2016 21:59:39 +0000 (21:59 +0000)]
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time am:
9c7b543325 -s ours
am:
7e03454985 -s ours
* commit '
7e0345498528611f538d8a5f259acc3440c1a649':
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
Wale Ogunwale [Thu, 18 Feb 2016 21:37:55 +0000 (13:37 -0800)]
Protect against surfaceController and hasSurface getting out of sync.
WindowStateAnimator.mSurfaceController is set to null whenever a
surface is destroyed and WindowState.mHasSurface is set to false
shortly after that. However, it is possible for them to get out
of sync in a couple of places due to exceptions or duplicate destroy.
Consolidated the call to set WindowState.mHasSurface inside a finally
block in WindowStateAnimator.destroySurface
Also, cleaned up the code a little to that it is more obvious what is
going on.
Bug:
27235356
Change-Id: I7e6d0c1fb015531c393ac86dcaebebd134fad612
Andre Eisenbach [Thu, 14 Jan 2016 22:20:34 +0000 (14:20 -0800)]
Read Bluetooth interop database entries from settings (1/2)
Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.
Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".
Bug:
26548845
Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949
(cherry picked from commit
3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7)
Yohei Yukawa [Thu, 18 Feb 2016 21:46:12 +0000 (13:46 -0800)]
Stop granting default Contacts permission to IMEs.
This partially reverts the previous commit [1], which allowed special
components to be granted some pre-configured default permissions.
With this CL, we no longer grant Contacts permissions to pre-installed
IMEs. Rationals are:
1. Even without this CL, not the all pre-installed IMEs are granted
Contacts permission by default, because it was done during the boot
time where InputMethodManagerService is not yet completely
initialized. The current behavior is confusing not only for users
but also for developers.
2. In almost all the cases, IMEs are supposed to be able to work
without Contacts permission. Hence it is not too late to ask users
to grant the permission to the IME after the initial setup is
completed.
3. It is difficult to add new features such as File-Based Encryption
(FBE) with keeping the current implementation, because currently we
dynamically call mSettings.setCurrentUserId(userId) just to
enumerate what IMEs will be enabled for a given user. Adding
another condition (whether the user has already unlocked the device
or not) would make things more complicated.
Note that LatinIME has already support the case where Contacts
permission is not granted by default. It does not ask users for
anything until Setup-Wizard is completed, and requests Contacts
permission only when the user taps a message in the suggestion strip
that suggests users to use contacts name for typing suggestions.
[1] If8b8cadbd1980ffe7a6fc15bbb5f54a425f6e8f9
adc1cf46045ae756d3a9ccbccf6b0f894e4c1edd
Bug:
24756974
Bug:
26743676
Change-Id: Ief2a40b5971b3eb97d765f934d20ce7f2ef25665
Chris Tate [Thu, 18 Feb 2016 21:43:27 +0000 (21:43 +0000)]
Merge "Add android:backupInForeground" into nyc-dev
Chong Zhang [Thu, 18 Feb 2016 21:32:44 +0000 (21:32 +0000)]
Merge "Use background drawable from the client" into nyc-dev
Chong Zhang [Tue, 9 Feb 2016 02:25:24 +0000 (18:25 -0800)]
Use background drawable from the client
And set the drawable's callback to null during drag-resizing, since
we use multi-threaded renderer, will do not want to schedule draws
to the ViewRootImpl's thread.
bug:
26729953
Change-Id: I6e5f94a5a6ba15edc2d391dd11d8fee3c657d337
(cherry picked from commit
1cc95075e89a0f91cb59ff37a1a027199040c7b4)
Chong Zhang [Fri, 12 Feb 2016 02:51:51 +0000 (18:51 -0800)]
Fix flicker when tapping quickly on dock divider
- Only add preserved surface to removal list when the new surface is shown
- When surface mode change again before the previous preserved surface is
removed, don't do nothing, instead, destroy the current surface which is
of wrong size.
bug:
26545679
Change-Id: Ifd548a0fa9ccdcbc9609ca38bb701cc7256cc6e1
(cherry picked from commit
ec63381f7596d89719fd3528b181ed1820a4cb84)
Wei Wang [Thu, 18 Feb 2016 21:07:43 +0000 (13:07 -0800)]
Add Java API for secure RTT protocol.
Change-Id: I1c012f9e92e8b2af332524363f8f0c9921bf4bb5
Etan Cohen [Tue, 16 Feb 2016 23:50:21 +0000 (15:50 -0800)]
NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]
Add the concept of a client ID which is used to identify a specific
(one of several) clients in all API calls.
Bug:
26962024
Change-Id: I43f13d51bee8b57c6d0ba1174168288b8d6c21c5
Christopher Tate [Thu, 18 Feb 2016 02:00:48 +0000 (18:00 -0800)]
Add android:backupInForeground
An app can now declare that it really needs to be backed up
whenever possible even if it is currently engaged in foreground-
equivalent work. Only applies to full-data backup clients: key/value
backups are not intrusive on normal lifecycle so they can already
happen in such circumstances.
Bug
26790411
Change-Id: Ia0ebcc7a53da888ae9ae4d63cd4bcab6e3a2e866
Adam Powell [Thu, 18 Feb 2016 20:43:47 +0000 (12:43 -0800)]
Restore auto-launch behavior for ACTION_CHOOSER with a single choice
For the initial release of Marshmallow auto-launching was suppressed
for ChooserActivity if there was only a single choice in order to let
the user confirm what would be launched. In practice, many apps use
ACTION_CHOOSER when they should probably use implicit intents, but
still others have use cases where setting a default doesn't make sense
and the user should still be able to make a choice when one is
available.
As the user confirmation didn't buy much in terms of developer API
expectations (ACTION_CHOOSER being a forced choice) and it adds
speedbumps to existing apps in the ecosystem, revert this change.
Bug
27243827
Change-Id: Id8fd5385d5b1f459e80b0096efe7e2944264739a
Makoto Onuki [Thu, 18 Feb 2016 20:26:40 +0000 (20:26 +0000)]
Merge "Fix bugs in user restriction migration" into nyc-dev
Amith Yamasani [Thu, 18 Feb 2016 20:16:55 +0000 (20:16 +0000)]
Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev
am:
7a313a63ca
* commit '
7a313a63cac7ae79699a6ea928af92429edd479b':
DO NOT MERGE Check apps idle states on time changes
Makoto Onuki [Thu, 18 Feb 2016 00:52:59 +0000 (16:52 -0800)]
Fix bugs in user restriction migration
Originally I didn't know user-0 could have PO, so I excluded this case
from migration. Now we handle it properly.
Also make sure only restrictions that can actually be set by each
owner moves to the owner restriction. (Because of this, we no longer
have to have DISALLOW_WALLPAPER in the exception list, because
owners can't set DISALLOW_WALLPAPER.)
Bug
27225996
Change-Id: I6ad79d90e6c4400abbb1e4feba6ba59e3b650815
Amith Yamasani [Thu, 18 Feb 2016 20:09:23 +0000 (20:09 +0000)]
Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev
Ben Kwa [Wed, 10 Feb 2016 23:48:25 +0000 (15:48 -0800)]
Implement type-to-focus in the DirectoryFragment.
Add a helper to the FocusManager, to handle alphanumeric keystrokes.
- Build a search index mapping document titles to adapter positions, and
keep it up-to-date.
- Intercept alphanumeric keystrokes and build up a search string from
them.
- Use the search string and index to set focus in the directory listing.
- Highlight code is written, but not activated in the UI for now, to
minimize surface area for potential breakages. Revisit enabling
highlights for O.
BUG=
24988911
Change-Id: I148ff5583c655338d12bc06d6484a9ed7aa528ad
Steve McKay [Thu, 18 Feb 2016 20:00:09 +0000 (20:00 +0000)]
Merge "Fix CTS failure." into nyc-dev
Steve McKay [Thu, 18 Feb 2016 19:32:26 +0000 (11:32 -0800)]
Fix CTS failure.
Loosen the reigns on setPickTarget to accommodate no sub command mode.
Change-Id: Ia11c4194970c93fe86e98dfd0d23ed4fa1cea765
Antonio Cansado [Thu, 18 Feb 2016 19:43:41 +0000 (19:43 +0000)]
Merge "Implementation of data usage callbacks." into nyc-dev
Keisuke Kuroyanagi [Thu, 18 Feb 2016 19:31:56 +0000 (11:31 -0800)]
Optimize: Use measureText instead of doLayout.
measureText is a light weight method dedicated to measure text width.
With this CL, breakText, doRunAdvance and doOffsetForAdvance use
measureText.
Bug:
24505153
Change-Id: Ibd62de2e0fe2e196cf07472f2270cc8c6325daab
Jeff Sharkey [Thu, 18 Feb 2016 19:26:34 +0000 (19:26 +0000)]
Merge "Make BackupManager encryption aware." into nyc-dev