OSDN Git Service
Julia Reynolds [Tue, 15 Aug 2017 18:43:00 +0000 (14:43 -0400)]
Optionally append managed service approvals
If the backup comes from a pre O device, don't wipe
preexisting managed service grants (which were introduced in O).
Merged-In: I142df7acb11309bc4f5f185e45a1f91f86d0334a
Merged-In: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987
Test: manual, restore from N to O DR
Bug:
64232609
Change-Id: Ieec2c821d9a088c69a5bc143acf8537ba300202d
TreeHugger Robot [Tue, 15 Aug 2017 17:19:48 +0000 (17:19 +0000)]
Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
Andrii Kulian [Tue, 15 Aug 2017 16:26:04 +0000 (16:26 +0000)]
Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 16:03:28 +0000 (16:03 +0000)]
Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev
Justin Klaassen [Tue, 15 Aug 2017 03:01:36 +0000 (20:01 -0700)]
Update Qualcomm(R) aptX(TM) strings
Bug:
63899732
Test: Verified strings in Settings > System > Developer Options.
Change-Id: I21d764b0c11ff1cc934d379b2062ecc5a697624c
Winson Chung [Mon, 14 Aug 2017 23:44:20 +0000 (16:44 -0700)]
Add fallback to reset the waiting for transition state.
- When launching into recents directly in another orientation, it
appears that the animation start callback is not made, which then
causes the transition-waiting state to persist until Overview is
next hidden. As a fallback, if we get onEnterAnimationComplete()
on the activity, then the animation has started and completed, so
we can reset the state.
Bug:
64694148
Test: Launch fixed-portrait app, hold device in landscape and then hit
recents button, ensure that recents button still works after.
Change-Id: Ibac8554c1f71324838fef1f04db2d88b16ffe219
sunjian [Mon, 14 Aug 2017 22:45:04 +0000 (15:45 -0700)]
Fix Android O: AccountManager API not working in managed profile.
Bug:
64577509
Test: NONE
Change-Id: I25650b2002d392ef9b7f4f4732106b22bc0eaae2
Andrii Kulian [Mon, 14 Aug 2017 22:30:48 +0000 (15:30 -0700)]
Place black background only behind nav bar when letterboxed
Placing black background behind the entire app window causes
alpha animation issues, that can be visible as black flash to
user.
This CL sizes and positions the background only behind the
navigation bar area.
Bug:
64598822
Test: Open letterboxed app, go to/from Recents, observe animations.
Change-Id: I16a2243117f87ca513d5ef291b7c1d3779467f3b
TreeHugger Robot [Mon, 14 Aug 2017 22:13:32 +0000 (22:13 +0000)]
Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev
Andrii Kulian [Fri, 11 Aug 2017 23:39:53 +0000 (16:39 -0700)]
Use fullscreen flag to define visibility of the background
Use fullscreen state provided by AM as a more reliable
source of truth to check if activity window hides other
windows behind.
Bug:
64615361
Test: Open Play Newsstand, click on article, go to and from Recents.
Change-Id: Ibc40a4241ed131f74da47c0d22833d2c3994cbe0
TreeHugger Robot [Sat, 12 Aug 2017 16:38:11 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 12 Aug 2017 16:36:25 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 12 Aug 2017 06:38:55 +0000 (23:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia29eec5aefc2e6751d5d97421e99aa0594b032cf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Sat, 12 Aug 2017 06:09:06 +0000 (06:09 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev
TreeHugger Robot [Sat, 12 Aug 2017 05:30:30 +0000 (05:30 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev
* changes:
Revert "Add (disabled) time zone update system server impl"
Revert "Time zone update API classes"
TreeHugger Robot [Sat, 12 Aug 2017 03:50:02 +0000 (03:50 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev
Bill Yi [Sat, 12 Aug 2017 03:38:57 +0000 (20:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58564c4ab4d58645ebe02e0e2a5e77290bac74fc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Dan Sandler [Sat, 12 Aug 2017 00:30:24 +0000 (20:30 -0400)]
Move USE_COLORIZED_NOTIFICATIONS to com.android.
It's @hidden, but CTS needs it to be out of the android.*
namespace too.
Fixes:
64613274
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: I753c2cc19111f9ed39e7fc3e006aab096c733ddc
Merged-In: I2046ae17b9e89ac0a83e182b91422fd242bc7557
Neil Fuller [Sat, 12 Aug 2017 00:09:41 +0000 (01:09 +0100)]
Move DISABLE_INPUT_DEVICE permission
Move DISABLE_INPUT_DEVICE permission out of the
reserved android namespace until the next API
version. It appears to be mostly unused.
Fixes:
64615722
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: If77fd9e5c0eede418fa14a37e5e895fee5667576
Merged-In: Ic98af7e3953da63c3c49bfd38d8cfd0ff0646869
Jean-Michel Trivi [Sat, 12 Aug 2017 01:28:20 +0000 (18:28 -0700)]
Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets
In the broadcast of Intent.ACTION_HEADSET_PLUG:
- restore setting "microphone" to 0 for line and headphone as
the input bit is never set for those devices
- for USB_HEADSET: there is no input bit for this device, so:
* when observing change for DEVICE_OUT, check status of DEVICE_IN
* when observing change for DEVICE_IN, only send the intent
if DEVICE_OUT is available.
Test: test broadcast and extras for Intent.ACTION_HEADSET_PLUG
Bug:
64250808
Change-Id: I0913933d03e21189bb552f60ae5dd35ffe28ddca
Ian Pedowitz [Fri, 11 Aug 2017 22:12:00 +0000 (15:12 -0700)]
Revert "Add (disabled) time zone update system server impl"
This reverts commit
328532ab13768a6303231b670708d750c4d7aa5f.
Fixes:
64606807
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: Iab0fd111803ae9e7615a3b2c825bbe8d84e29edf
Merged-In: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Ian Pedowitz [Fri, 11 Aug 2017 21:23:17 +0000 (14:23 -0700)]
Revert "Time zone update API classes"
This reverts commit
fe6ec56cce981731be7d0bc0e61a0411d0a0d2cf.
Fixes:
64606807
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: I238e2b6fa7ce60e6a8cbfebcd13e5e4c596834af
Merged-In: I31b55e88072dd73055cb3d8cf252be6eac920322
Andrii Kulian [Sat, 12 Aug 2017 01:01:11 +0000 (18:01 -0700)]
Update background crop animation threshold
Empiric value for animation epsilon covers only the last
frame of the animation, which is not enough in some case.
This CL makes it a little bigger to cover two last frames.
The change is visually indistinguishable for user.
Bug:
63156733
Test: Go to/from recents with letterboxed app.
Change-Id: I42423527688dcb2dc157ae16bbe5b6de7eee3449
TreeHugger Robot [Fri, 11 Aug 2017 23:43:11 +0000 (23:43 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
Andrii Kulian [Fri, 11 Aug 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 21:37:06 +0000 (21:37 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev
Adrian Roos [Fri, 11 Aug 2017 17:43:17 +0000 (19:43 +0200)]
AOD: Fix navbar flicker when transitioning to AOD
Under certain circumstances, the transition to AOD can happen before
the navigation bar gets a chance to hide itself, which happens in a
traversal. To work around this, post turning the screen on such that
it only happens after the next traversal.
Change-Id: I178b9394e7cc6baa8e9552c9819c3ce9b044defb
Fixes:
64599221
Test: Open Whatsapp / Gmail, turn off screen, verify navbar does not flicker.
Jason Monk [Fri, 11 Aug 2017 21:19:04 +0000 (21:19 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
Cindy Kuang [Fri, 11 Aug 2017 21:14:33 +0000 (21:14 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am:
dc12cb1fb2
Change-Id: I297557eb072b1fce0395c93c2a770623b5ba1642
Cindy Kuang [Fri, 11 Aug 2017 21:01:15 +0000 (21:01 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I094bd99bcaaf51633ac887d38a9323ed5fdc54e2
Pankaj Kanwar [Fri, 11 Aug 2017 20:52:52 +0000 (20:52 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
Cindy Kuang [Fri, 11 Aug 2017 20:38:35 +0000 (20:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
Cindy Kuang [Fri, 11 Aug 2017 20:33:34 +0000 (20:33 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
Makoto Onuki [Fri, 11 Aug 2017 19:11:39 +0000 (12:11 -0700)]
WTF when device has no persistent periodic syncs...
... when it most likely has some.
Bug:
64536115
Test: manual
Change-Id: I24c4c950b0266ef22918156c29384bc452f523af
Jason Monk [Fri, 11 Aug 2017 16:53:36 +0000 (12:53 -0400)]
Change default temp threshold to use shutdown temp
Base the temp threshold to be based on the shutdown temp lowered
by some amount to ensure the warning can be seen before a shutdown.
Test: runtest systemui
Change-Id: I033a776e874d76018592954932ed5127e1b228ae
Fixes:
62845934
Andrii Kulian [Fri, 11 Aug 2017 18:27:00 +0000 (11:27 -0700)]
Don't animate black background on cold launch from launcher
When animating cold start from launcher we can't compute the
progress in SurfaceControlWithBackground#calculateBgCrop() via
tracking status bar insets. This CL won't animate bg crop
in case the progress does not make sense.
Bug:
64598822
Test: Cold launch letterboxed app from launcher.
Change-Id: I82182a3c46dd4f81bcf056d1163f78c450bd9b83
Tyler Gunn [Fri, 11 Aug 2017 16:24:41 +0000 (09:24 -0700)]
Catch BadParcelableException in RemoteConnection when setting extras.
Unlike the code in Telecom which can use Bundle.setDefusable(..), this
framework code is used within a Connection Manager's code space, so the
setDefusable method does not work.
To prevent crashing the Connection Manager's app, catching the exception
and ignoring extras in this case (not much else we can do).
I've also filed a bug against the offending component known for putting
bad parcelables into the extras.
Test: Modified code to force this scenario.
Bug:
64499462
Change-Id: If44ad2e2c8e285d513969c6babe5a798242da53d
Esteban Talavera [Fri, 11 Aug 2017 12:34:00 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3 -s ours
Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d
TreeHugger Robot [Fri, 11 Aug 2017 12:25:01 +0000 (12:25 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
TreeHugger Robot [Fri, 11 Aug 2017 00:59:08 +0000 (00:59 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
Phil Weaver [Thu, 10 Aug 2017 22:34:03 +0000 (22:34 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
Kevin Chyn [Thu, 10 Aug 2017 18:40:37 +0000 (11:40 -0700)]
Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission
Test: make -j56 cts
run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Fixes:
64560640
Change-Id: Ic807028567da9a4f3f108121d3e36358a513cf04
Phil Weaver [Thu, 10 Aug 2017 19:31:34 +0000 (12:31 -0700)]
Stop focusing views before layout.
Rolls back one line of ag/
2257919.
Bug:
63811145
Test: TalkBack no longer reads the page backwards in:
Settings > System > Reset > Factory data reset
Settings > Connected devices > Android Beam
Change-Id: I6b04e64cd650ebda193da4a54bf0721bd256820c
TreeHugger Robot [Thu, 10 Aug 2017 17:32:47 +0000 (17:32 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
Cindy Kuang [Wed, 9 Aug 2017 17:08:15 +0000 (10:08 -0700)]
docs: replaced "i.e." to fix formatting error
Test: make ds-docs
Bug:
6440865
Change-Id: I428476ddfe55f14df531ea6a1c3e3a09f7a29e7d
Ian Pedowitz [Thu, 10 Aug 2017 02:15:31 +0000 (19:15 -0700)]
Revert "Initial support for proposed android.net.lowpan"
This reverts commit
4e0c2195dd999859f4e79cec1884326fb52a5916.
Fixes:
64111427
Test: Grabbed OC CTS binaries
Test: Extracted android-cts.zip and from android-cts/tools directory launched ./cts-tradefed
Test: On the DUT (running build which has this CL cherrypicked), ran the below (will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: Note, while b/
64111427 is fixed, this uncovered b/
64560640
Change-Id: I1d2132678281a917f03c69d5ead1d28313d7f46d
Merged-In: Icab67ba2c40bc02968e3f8ed2da5a4a3be6cf77f
TreeHugger Robot [Thu, 10 Aug 2017 06:42:32 +0000 (06:42 +0000)]
Merge "Remove config_demoModePackage resource" into oc-dr1-dev
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:00:34 +0000 (06:00 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 05:28:47 +0000 (05:28 +0000)]
Merge "Add settings and reset operations for demo users" into oc-dr1-dev
Justin Klaassen [Wed, 9 Aug 2017 04:07:24 +0000 (21:07 -0700)]
Remove config_demoModePackage resource
Bug:
62712426
Test: lunch walleye-eng && make -j19
Change-Id: Ifa1080d85222a43871598eaf0fe9813625d9115d
Christine Franks [Mon, 7 Aug 2017 21:28:35 +0000 (14:28 -0700)]
Add settings and reset operations for demo users
- Allow Global settings to be set in demo mode
- Allow Secure settings to be set by demo users
- Allow fully enabling apps for demo users
- Send enable broadcast as foreground broadcast
Bug:
62712426
Test: runtest -c \
com.android.server.devicepolicy.DevicePolicyManagerTest \
frameworks-services
Change-Id: Icd5d1eda12aa6b97bd4770713710a982bb0fc8e5
TreeHugger Robot [Thu, 10 Aug 2017 02:17:48 +0000 (02:17 +0000)]
Merge "Don't lock down system user in demo mode" into oc-dr1-dev
Phil Weaver [Thu, 10 Aug 2017 00:13:04 +0000 (00:13 +0000)]
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 23:12:57 +0000 (23:12 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev
Andrii Kulian [Wed, 9 Aug 2017 22:40:59 +0000 (22:40 +0000)]
Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 22:33:34 +0000 (22:33 +0000)]
Merge "Support copying from index8 into another index8." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 22:23:14 +0000 (22:23 +0000)]
Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev
Paul Mclean [Wed, 9 Aug 2017 21:59:55 +0000 (21:59 +0000)]
Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev
Cindy Kuang [Wed, 9 Aug 2017 21:49:19 +0000 (14:49 -0700)]
docs: corrected grammar mistake in Class Overview
Test: make ds-docs
Bug:
17533073
Change-Id: Iaf22ad26794e2aac454a736efc746bca6f48eb82
Vinay Kalia [Wed, 9 Aug 2017 21:11:53 +0000 (21:11 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
am:
6e749c392b
Change-Id: I35705a81a45d2c7fd48f021a5e0e93e1709c6876
TreeHugger Robot [Wed, 9 Aug 2017 21:03:15 +0000 (21:03 +0000)]
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
Vinay Kalia [Wed, 9 Aug 2017 21:02:32 +0000 (21:02 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
TreeHugger Robot [Wed, 9 Aug 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Make rounded corners handle color inversion" into oc-dr1-dev
Bryce Lee [Wed, 9 Aug 2017 20:21:03 +0000 (20:21 +0000)]
Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev
Christine Franks [Wed, 9 Aug 2017 20:06:35 +0000 (20:06 +0000)]
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:28:49 +0000 (19:28 +0000)]
Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:24:16 +0000 (19:24 +0000)]
Merge "Fix race condition in binder thread" into oc-dr1-dev
Paul McLean [Fri, 4 Aug 2017 17:12:19 +0000 (11:12 -0600)]
Update isWiredHeadsetOn() to support USB headsets.
Bug:
64250808
Test: Manual from an App (UsbDescriptors app)
Change-Id: Ic979636025e871d69853a7460befce4e1b1a6ed8
Winson Chung [Wed, 9 Aug 2017 18:52:42 +0000 (18:52 +0000)]
Merge changes I52152223,I49db5cab into oc-dr1-dev
* changes:
Ensure that we register the media session listener for the current user.
Fix issue with PiP callbacks not being handled for secondary users.
Derek Sollenberger [Fri, 4 Aug 2017 18:13:57 +0000 (14:13 -0400)]
Support copying from index8 into another index8.
Both bitmap's must share the same color table as we essentially
memcopy the pixel data between the buffers.
Bug:
64112829
Test: CtsGraphicsTestCases
Merged-In: I317e3a814dbd102925fe412d2e19111b0af3af38
Change-Id: I5d99627fe7dd0639bb47a2eb8790510beebe6c6f
Phil Weaver [Wed, 9 Aug 2017 18:28:41 +0000 (11:28 -0700)]
Fix source for PiP hover accessibility events
The events were ending up not important for a11y and
with invalid window ids, which prevented TalkBack from
seeing them properly.
Bug:
64428961
Test: Ran YouTube in PiP, now able to select it.
Change-Id: I38ccbf5f2f35ffda255b84f229e98ca23e6b11aa
Zheng Zhang [Wed, 9 Aug 2017 18:24:15 +0000 (18:24 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am:
9468b48565 -s ours am:
4542686e42
am:
c915b7f703
Change-Id: If08c8029ad5054f947ada0c5f4923f62761bf47c
Wei Wang [Wed, 9 Aug 2017 18:23:00 +0000 (18:23 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am:
2ed0166808 -s ours am:
5d60709dc3
am:
17669d31df
Change-Id: I7e5b94c6adf57ff19c64fe508f7f3cc6d6a9c1c7
Zheng Zhang [Wed, 9 Aug 2017 18:09:48 +0000 (18:09 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am:
9468b48565 -s ours
am:
4542686e42
Change-Id: Id140fee89f552999522f3116854761c14265ef04
Wei Wang [Wed, 9 Aug 2017 18:08:52 +0000 (18:08 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am:
2ed0166808 -s ours
am:
5d60709dc3
Change-Id: I10a42eee839da98af9434d1f7530335dfa732632
Zheng Zhang [Wed, 9 Aug 2017 17:58:18 +0000 (17:58 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
am:
9468b48565 -s ours
Change-Id: Ia1c10a46771ff4602a1005a3bf0bddaf6f1a70b6
Wei Wang [Wed, 9 Aug 2017 17:57:17 +0000 (17:57 +0000)]
Fix Wakelock underlock in GnssLocationProvider.
am:
2ed0166808 -s ours
Change-Id: I965a5b57ffbc2adcde3a83a95793a3dc29673641
Selim Cinek [Tue, 8 Aug 2017 17:58:32 +0000 (10:58 -0700)]
Worked around a bug where the a group child could be leaked
It may happen that a group entry could be leaked, if an
entry is inserted again after it was removed. We now added
logging to detect it better and worked around the issue.
Change-Id: Iaa6dfedddf5bafe0697bd0411b2e5f24982b1160
Fixes:
63717947
Test: add groups and remove / hun children
TreeHugger Robot [Wed, 9 Aug 2017 17:43:58 +0000 (17:43 +0000)]
Merge "Grant default ringtone picker storage permissions" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 17:31:48 +0000 (17:31 +0000)]
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev
Christine Franks [Wed, 9 Aug 2017 17:06:43 +0000 (10:06 -0700)]
Allow SMS and calling for demo users
Bug:
62712426
Test: manual - restrictions are unset in demo mode
Change-Id: I151fbfb8222e768403a7e5ba1fcf868ba35a1f22
Lucas Dupin [Wed, 9 Aug 2017 16:58:44 +0000 (16:58 +0000)]
Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev
Adrian Roos [Wed, 9 Aug 2017 16:47:19 +0000 (16:47 +0000)]
Merge "AOD: Fix janky pulse out animation" into oc-dr1-dev
Rob Carr [Wed, 9 Aug 2017 16:45:24 +0000 (16:45 +0000)]
Merge "Ensure we leave the orientation changing state." into oc-dr1-dev
Winson Chung [Tue, 8 Aug 2017 19:58:11 +0000 (12:58 -0700)]
Ensure that we register the media session listener for the current user.
- Use the per-user calls when fetching/responding to media session events
otherwise it will fallback to using the process user.
Bug:
64315017
Test: Launch secondary user, enter PiP with media session and no custom
actions. Ensure the media session buttons show.
Change-Id: I52152223e91f0256ac4135616694e2a293947e3e
TreeHugger Robot [Wed, 9 Aug 2017 16:34:47 +0000 (16:34 +0000)]
Merge "LockIcon: update content description when config changes" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:22:29 +0000 (16:22 +0000)]
Merge "BrightnessMirror: When reinflating, notify QSPanel" into oc-dr1-dev
Jorim Jaggi [Wed, 9 Aug 2017 16:10:35 +0000 (16:10 +0000)]
Merge "Fix out-of-order transactions (1/2)" into oc-dr1-dev
Vinay Kalia [Fri, 28 Jul 2017 22:09:57 +0000 (15:09 -0700)]
Fix BLE scan leaks
If an app starts multiple scans with same callback then
there is a collision in mLeScanClients hash map which
results in leaking first scan. This change fixes it by
not allowing the second scan with same callback.
BUG:
62389939
BUG:
38198694
Test: Tested applications which started multiple scans with
same callback.
Change-Id: I569069a40b6f8b4b8bb070731225e732c6b23ec8
(cherry picked from commit
9722971cb4a79e37165f636f9dd057707d2e620a)
TreeHugger Robot [Wed, 9 Aug 2017 15:59:32 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Jason Monk [Wed, 9 Aug 2017 14:45:05 +0000 (10:45 -0400)]
Make rounded corners handle color inversion
Test: visual
Change-Id: I99284b9f24340a453d39aafe6937454892e1383d
Fixes:
64210958
TreeHugger Robot [Wed, 9 Aug 2017 14:13:15 +0000 (14:13 +0000)]
Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev
Lucas Dupin [Tue, 8 Aug 2017 18:17:30 +0000 (14:17 -0400)]
Fix race condition in binder thread
Changing wallpapers too quickly could cause a race condition where
RemoteCallbackList#beginBroadcast would be called twice without
the corresponding call to end the broadcast.
Change-Id: I2e63df69ff4ffde76a0b91a2ad46f03d044d95b7
Test: Set breakpoint to pause thread and cause race condition.
Bug:
64391687
Adrian Roos [Wed, 9 Aug 2017 13:50:00 +0000 (15:50 +0200)]
LockIcon: update content description when config changes
Fixes a stale content description after a configuration change.
Change-Id: Ie666d405417ce47cc0fc550b79a948425565162d
Fixes:
64234917
Test: Change language, verify content description of lock icon is updated.
Adrian Roos [Wed, 9 Aug 2017 12:34:55 +0000 (14:34 +0200)]
BrightnessMirror: When reinflating, notify QSPanel
Fixes an issue where after reinflating the brightness mirror,
the QSPanel was not notified.
Change-Id: I3974f31c2d3c67b5a283b10690cb103ca13fff6a
Fixes:
64460731
Test: Change to white / black wallpaper (opposite of current); verify brightness slider works.
Jorim Jaggi [Tue, 8 Aug 2017 13:12:20 +0000 (15:12 +0200)]
Fix out-of-order transactions (1/2)
The following sequence of order may happen which cause wrong
surface positions:
- WA.animate updates surfaces properties to S
- WA.animate closes the surface transaction
- Since the previous animation transaction wasn't commited yet,
closeSurfaceTransaction blocks and updating the surface properties
on SF side is deferred.
- In the meantime, since we are not holding WM lock, we have
another thread updating surfaces properties to S'
- Closing the transaction in this thread completes immediately
because it's not a synchronous transaction or animation
transaction.
- After a frame has been processed S gets applied on SF side as
the other transaction is done waiting for the frame to complete.
The issue here is that properties are now set to S instead of S'.
Sad!
We originally started calling closeTransaction without the WM
lock being held because it lead to thread starvation (b/
38192114).
However, that fix has this big flaw as described above.
To fix this, we create an empty animation transaction before
updating the animation properties to simulate the back-pressuring
behavior of animation transactions without the WM lock being held.
If that transaction arrives out of order, it doesn't matter at all
because it is empty.
After that, we perform the animation udpate in a transaction that
is not marked as an animation transaction, and thus will not
block, which avoids the starvation issue.
Part of this change is also a change in SF to allow executing
empty animation transactions.
Test: go/wm-smoke
Test: Open VideoPlayer from VRCore, close it, observe no wrong
positiioning of surfaces.
Test: Inspect traces while animating. Ensure back pressuring still
works.
Change-Id: Ie545463e71e0d1bc73439d14381077a290d2f959
Fixes:
63905190
Bug:
38192114
TreeHugger Robot [Wed, 9 Aug 2017 10:17:09 +0000 (10:17 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev
Pavel Grafov [Tue, 8 Aug 2017 15:53:32 +0000 (16:53 +0100)]
Mark profile password key as critical.
Currently it is erased when keystore for user 0 is cleared, e.g.
when the user clears data for Settings app.
Bug:
35929605
Bug:
64467610
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
Merged-In: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
The Android Open Source Project [Wed, 9 Aug 2017 07:54:18 +0000 (00:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I02e4b572c91641f5d61321bd3248081723ad65ab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Christofer Ã…kersten [Mon, 7 Aug 2017 09:56:52 +0000 (18:56 +0900)]
Inherit theme dark/light scheme for MediaRouter dialogs/button
Bug:
64291950
Test: manual
Change-Id: I20694ce512a794a3c6574108b80dcfb4979b3b39
Merged-In: I20694ce512a794a3c6574108b80dcfb4979b3b39