OSDN Git Service
Leon Scroggins III [Thu, 5 Apr 2018 23:02:59 +0000 (16:02 -0700)]
Merge "Never scale nine-patches in ImageDecoder" into pi-dev
am:
9cb6759072
Change-Id: I468c9a0c0b83713e86c49612f27c672e957572df
Lucas Dupin [Thu, 5 Apr 2018 22:57:09 +0000 (15:57 -0700)]
Merge "Update mFirstVisibleIconState correctly" into pi-dev
am:
ec3f8260de
Change-Id: Iea09d705ccad543f5c2c25962f53b05c8c8ab493
TreeHugger Robot [Thu, 5 Apr 2018 22:42:39 +0000 (22:42 +0000)]
Merge "Never scale nine-patches in ImageDecoder" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 22:42:34 +0000 (22:42 +0000)]
Merge "Update mFirstVisibleIconState correctly" into pi-dev
Evan Laird [Thu, 5 Apr 2018 22:41:23 +0000 (15:41 -0700)]
Merge "Don't hide the mobile type id if it doesn't change" into pi-dev
am:
13f92ccc96
Change-Id: Id9943b2de8dd2b588a7261c1172fb16d3776e7c1
Evan Laird [Thu, 5 Apr 2018 22:36:29 +0000 (15:36 -0700)]
Merge "Use #fff for ethernet signal indicators" into pi-dev
am:
8317bdcacd
Change-Id: Ibb697a0bb5ce904a2db8f5928d74850829ea24fa
TreeHugger Robot [Thu, 5 Apr 2018 22:22:41 +0000 (22:22 +0000)]
Merge "Don't hide the mobile type id if it doesn't change" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 22:21:23 +0000 (22:21 +0000)]
Merge "Use #fff for ethernet signal indicators" into pi-dev
Salvador Martinez [Thu, 5 Apr 2018 22:19:32 +0000 (15:19 -0700)]
Merge "Add metrics constant for wifi scanning dialog" into pi-dev
am:
0b17eb5f4a
Change-Id: I9c82978c6b6305c4710719bc8f3ff7480b175fc4
TreeHugger Robot [Thu, 5 Apr 2018 22:07:30 +0000 (22:07 +0000)]
Merge "Add metrics constant for wifi scanning dialog" into pi-dev
Vishwath Mohan [Thu, 5 Apr 2018 21:49:14 +0000 (14:49 -0700)]
Merge "Rename BiometricDialog to BiometricPrompt." into pi-dev
am:
5ab3cf8bec
Change-Id: Id450c37765a5f657c6fe422aa98e3b7191d7b773
Pavel Maltsev [Thu, 5 Apr 2018 21:38:01 +0000 (14:38 -0700)]
Merge "Allow OEMs to restrict access to secondary display" into pi-dev
am:
7ba60d25f3
Change-Id: I3b1a73a1a719a36af26f539ea79af8724b5010f1
Suprabh Shukla [Thu, 5 Apr 2018 21:29:46 +0000 (14:29 -0700)]
Merge "Activity interceptor dialog for suspended apps" into pi-dev
am:
822ce4f3aa
Change-Id: Id54f6edcbc854d6f58eae23d877884d1390c28c8
Vishwath Mohan [Thu, 5 Apr 2018 21:23:32 +0000 (21:23 +0000)]
Merge "Rename BiometricDialog to BiometricPrompt." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 21:17:52 +0000 (21:17 +0000)]
Merge "Allow OEMs to restrict access to secondary display" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 21:15:19 +0000 (21:15 +0000)]
Merge "Activity interceptor dialog for suspended apps" into pi-dev
Evan Laird [Thu, 5 Apr 2018 21:13:18 +0000 (17:13 -0400)]
Use #fff for ethernet signal indicators
Tinting is controlled by the icon manager now, so intrinsic tinting of
the icon isn't needed
Test: visual when connected to ethernet;
Change-Id: I7c97ad13084e55974b65223fcfe4e027aa343d49
Fixes:
77551489
Leon Scroggins III [Thu, 5 Apr 2018 21:11:12 +0000 (14:11 -0700)]
Merge "Rename set/get-ConserveMemory" into pi-dev
am:
d2c218f78a
Change-Id: Ib503dcfca248abdc31ee879bb4bef7a7c1af7977
Marco Nelissen [Thu, 5 Apr 2018 21:05:21 +0000 (14:05 -0700)]
Merge "Add @TestApi for field needed for test" into pi-dev
am:
d8a6f0cd94
Change-Id: Ic57c03646b7b77810747eb8d067be985001d331f
Lucas Dupin [Thu, 5 Apr 2018 20:51:14 +0000 (13:51 -0700)]
Merge "Darker scrim under unlocked shade" into pi-dev
am:
c539590768
Change-Id: I71b1718c228779c3d2a9a74f1aa3534984b0a91b
TreeHugger Robot [Thu, 5 Apr 2018 20:44:58 +0000 (20:44 +0000)]
Merge "Rename set/get-ConserveMemory" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 20:41:24 +0000 (20:41 +0000)]
Merge "Add @TestApi for field needed for test" into pi-dev
Wale Ogunwale [Thu, 5 Apr 2018 20:40:17 +0000 (13:40 -0700)]
Merge "Show Recents if we are bringing a task forward in split-screen-primary" into pi-dev
am:
e576def01a
Change-Id: I90ec64f617ba563780df550d747e37e1c8e7853d
Lucas Dupin [Thu, 5 Apr 2018 20:35:05 +0000 (20:35 +0000)]
Merge "Darker scrim under unlocked shade" into pi-dev
Salvador Martinez [Wed, 4 Apr 2018 21:45:42 +0000 (14:45 -0700)]
Add metrics constant for wifi scanning dialog
This CL simply adds a metrics proto constant for the new dialog
that shows up if you try to tunr on auto-wifi without first
enabling wifi scanning.
Test: robotests still pass
Bug:
67070896
Change-Id: I9a4e0fa105e67d666e2e34588bea037034a28784
Evan Laird [Thu, 5 Apr 2018 20:22:36 +0000 (16:22 -0400)]
Don't hide the mobile type id if it doesn't change
_Someone_ thought it would be a good idea to hide the mobile type
indicator if it hadn't changed from the last state. Better to not do
that.
Also removed an unused method in StatusBarIconControllerImpl.
Test: Reboot device with wifi off; data type indicator should show up
eventually; i.e., visual
Fixes:
77581445
Change-Id: I47a0c868b0e332c11e206b8c043a532bcbf10130
Wale Ogunwale [Thu, 5 Apr 2018 20:21:33 +0000 (20:21 +0000)]
Merge "Show Recents if we are bringing a task forward in split-screen-primary" into pi-dev
Kevin Han [Thu, 5 Apr 2018 19:49:25 +0000 (12:49 -0700)]
Merge "Turn off notification in-line images for low ram devices" into pi-dev
am:
c7b4c2dc16
Change-Id: Ib4e9e819ef28a1dccac275e663da7c448b62dc01
Lucas Dupin [Thu, 5 Apr 2018 19:48:43 +0000 (12:48 -0700)]
Update mFirstVisibleIconState correctly
Test: visual
Change-Id: I4b6ca09b6bb8241791126f057de6d173ddd7eac0
Fixes:
77634935
Kevin Han [Thu, 5 Apr 2018 19:33:55 +0000 (19:33 +0000)]
Merge "Turn off notification in-line images for low ram devices" into pi-dev
Rob Carr [Thu, 5 Apr 2018 19:31:07 +0000 (12:31 -0700)]
Merge "Forward Activity stop signal to attached windows." into pi-dev
am:
d1366f604a
Change-Id: I6862c29dcda7a0a16eeafb60688e3176a34aba8b
David Zeuthen [Thu, 5 Apr 2018 19:24:24 +0000 (12:24 -0700)]
Merge "ConfirmationPrompt: Update for API review." into pi-dev
am:
ae938f5437
Change-Id: I62cec3ebc437a131761a9d7109df911a1cf1e24c
Yi Jin [Thu, 5 Apr 2018 19:10:55 +0000 (12:10 -0700)]
Merge "This cl tries to fix cts tests IncidentdTest" into pi-dev
am:
72a39eb3be
Change-Id: Ia9e3f94b367dffc6482f5f3ba12aeaba2eed6874
Richard Ledley [Thu, 5 Apr 2018 19:05:50 +0000 (12:05 -0700)]
Merge "Add null check for Nullable argument." into pi-dev
am:
335b0d36da
Change-Id: I610900225de4a9da865599284d083bfcdf726966
Rob Carr [Thu, 5 Apr 2018 19:03:29 +0000 (19:03 +0000)]
Merge "Forward Activity stop signal to attached windows." into pi-dev
Matthew Ng [Thu, 5 Apr 2018 19:02:32 +0000 (12:02 -0700)]
Merge "Remove haptics on navbar and only have button haptics on touch up" into pi-dev
am:
fa5134e960
Change-Id: I40106ae4631882bdf09f1d5bba522eb2cb5c6e41
TreeHugger Robot [Thu, 5 Apr 2018 18:50:35 +0000 (18:50 +0000)]
Merge "ConfirmationPrompt: Update for API review." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 18:48:59 +0000 (18:48 +0000)]
Merge "This cl tries to fix cts tests IncidentdTest" into pi-dev
Richard Ledley [Thu, 5 Apr 2018 18:45:45 +0000 (18:45 +0000)]
Merge "Add null check for Nullable argument." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 18:42:33 +0000 (18:42 +0000)]
Merge "Remove haptics on navbar and only have button haptics on touch up" into pi-dev
Hall Liu [Thu, 5 Apr 2018 18:36:10 +0000 (11:36 -0700)]
Merge "Move RTT system setting to Settings.Secure" into pi-dev
am:
fe85e4589b
Change-Id: Idd9171f313136911e2dc6031f6356463e51bf16f
Yangster-mac [Thu, 5 Apr 2018 18:22:16 +0000 (11:22 -0700)]
Merge "Retry logs write when it fails. Report skipped event in statsd." into pi-dev
am:
164a73e0cf
Change-Id: I6aac360fe74bb5ca3e3b95dc3f2685a99da0fe2a
Daniel Cardenas [Thu, 5 Apr 2018 18:18:24 +0000 (11:18 -0700)]
Merge "Reduce log spam in TimeSparseArray" into pi-dev
am:
bd2e790946
Change-Id: Iffacb38ca50741f78c3d49aa5ace6416eb7280ab
Hall Liu [Thu, 5 Apr 2018 18:15:37 +0000 (18:15 +0000)]
Merge "Move RTT system setting to Settings.Secure" into pi-dev
Tej Singh [Thu, 5 Apr 2018 18:11:36 +0000 (11:11 -0700)]
Merge "BugFix: Config TTL" into pi-dev
am:
b6d4401da1
Change-Id: I2871fdef3e659e9edf6a97052cb34b5831aebc34
TreeHugger Robot [Thu, 5 Apr 2018 18:04:18 +0000 (18:04 +0000)]
Merge "Retry logs write when it fails. Report skipped event in statsd." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 18:01:52 +0000 (18:01 +0000)]
Merge "Reduce log spam in TimeSparseArray" into pi-dev
Nicolas Geoffray [Thu, 5 Apr 2018 18:00:37 +0000 (11:00 -0700)]
Merge "Add new hidden APIs." into pi-dev
am:
0c2b3185b2
Change-Id: Ic0d86e7fe25961d7779e71d0eeb15e8f590b37b4
TreeHugger Robot [Thu, 5 Apr 2018 17:56:53 +0000 (17:56 +0000)]
Merge "BugFix: Config TTL" into pi-dev
Tracy Zhou [Thu, 5 Apr 2018 17:51:23 +0000 (10:51 -0700)]
Merge "Only move PIP window if PIP is not way above shelf/IME." into pi-dev
am:
0c97d0899e
Change-Id: I32ca69f9ad41c756b774a62d9afdcbc8edb19316
Lucas Dupin [Thu, 5 Apr 2018 17:43:19 +0000 (10:43 -0700)]
Merge "Misc bouncer fixes" into pi-dev
am:
7362e18a7b
Change-Id: I55a93fdc097ffe977b194ef7c7620bca0070b194
Vishwath Mohan [Thu, 5 Apr 2018 17:28:24 +0000 (10:28 -0700)]
Rename BiometricDialog to BiometricPrompt.
Renamed to BiometricPrompt per API-council feedback.
Bug:
77494933
Test: m -j70
Change-Id: Ifed2b8f3439a7e671e0ce46d3a7db9f24871b16a
TreeHugger Robot [Thu, 5 Apr 2018 17:37:21 +0000 (17:37 +0000)]
Merge "Add new hidden APIs." into pi-dev
Patrick Baumann [Thu, 5 Apr 2018 17:31:59 +0000 (10:31 -0700)]
Merge "Fixes non-web AIA internal launch" into pi-dev
am:
cb331c32db
Change-Id: I6a4b7e4cde4fd157ab1101e5c2f254d7652416fb
Wale Ogunwale [Thu, 5 Apr 2018 17:25:59 +0000 (10:25 -0700)]
Show Recents if we are bringing a task forward in split-screen-primary
Regression caused by ag/
3288245
Change-Id: Ie21d7d57d62658ea5b0db255902dc22517ef3ae7
Fixes:
76109079
Test: steps from bug
Jan Althaus [Thu, 5 Apr 2018 17:24:34 +0000 (10:24 -0700)]
Merge "Makes TCS methods non-abstract" into pi-dev
am:
37317e1668
Change-Id: I874abc508d95176f7e58535e217bcbed42655570
TreeHugger Robot [Thu, 5 Apr 2018 17:24:26 +0000 (17:24 +0000)]
Merge "Only move PIP window if PIP is not way above shelf/IME." into pi-dev
Lucas Dupin [Thu, 5 Apr 2018 17:21:26 +0000 (17:21 +0000)]
Merge "Misc bouncer fixes" into pi-dev
Kevin [Thu, 5 Apr 2018 17:17:45 +0000 (10:17 -0700)]
Turn off notification in-line images for low ram devices
Bug:
77598694
Change-Id: Icdd4c2ef790d2d657f7670fa8c1b8b39b7aa62e4
Fix:
77598694
Test: manual, tested notification on gobo and sailfish
Lucas Dupin [Thu, 5 Apr 2018 17:00:31 +0000 (10:00 -0700)]
Darker scrim under unlocked shade
Test: visual
Change-Id: I21a1d035117d88ba580441b002133e380429e5a5
Fixes:
77224997
TreeHugger Robot [Thu, 5 Apr 2018 17:07:14 +0000 (17:07 +0000)]
Merge "Fixes non-web AIA internal launch" into pi-dev
Dongwon Kang [Thu, 5 Apr 2018 17:06:42 +0000 (10:06 -0700)]
Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev
am:
b9c661f79f
Change-Id: I421a35ec4ac0b695c6807250e1ced6c91d451d67
Jan Althaus [Thu, 5 Apr 2018 16:53:17 +0000 (16:53 +0000)]
Merge "Makes TCS methods non-abstract" into pi-dev
Leon Scroggins III [Wed, 4 Apr 2018 20:19:33 +0000 (16:19 -0400)]
Never scale nine-patches in ImageDecoder
Bug:
76448902
Bug:
70889348
Test: Manual + CtsThemeHostTestCases
(Ica5e7e81848c3880accee922ee6f1cc9e26262ca)
Scaling a nine-patch requires scaling its divs. When the scale factor is
not an integer, we have to round. This gets out of sync with the way the
decoder scaled the image, resulting in stretching or keeping fixed the
wrong portions of the image. Making this worse, when we scale down, we
end up with divs colliding with each other, and we have to arbitrarily
adjust them further so they do not collide.
NinePatchDrawable and the drawing code already know how to handle
drawing from the originally-sized image and do a better job stretching
appropriately, so allow them to do their job.
We already do something similar for Bitmaps created by ImageDecoder on
apps targeting P and above - instead of scaling them up, we allow the
BitmapDrawable's scaling code to handle density differences. We
preserved the old behavior (scale up) on apps targeting pre-P because
those apps may rely on the size of the Bitmap contained in a
BitmapDrawable without accounting for its density (see Bug:
74061412).
But that is not an issue for NinePatchDrawables, which do not allow
peeking at their internal Bitmaps.
Rewrite ImageDecoder.computeDensity. There is no need for it to be
static, since it takes an ImageDecoder as a parameter and reads its
fields, including the new field mIsNinePatch. Set mIsNinePatch in the
constructor to avoid another down call into native. Split up the
conditions that result in returning srcDensity without calling
setTargetSize for clarity.
Remove ImageDecoder constructor from the graylist. It was accidentally
added due to the fact that it is called transitively from public APIs.
Change-Id: I3c5ddd67f3352c991515f30ce1c477c9a608833f
Patrick Baumann [Thu, 5 Apr 2018 16:50:27 +0000 (09:50 -0700)]
Merge "Copy ApplicationInfo#versionCode field" into pi-dev
am:
a4d6570b2f
Change-Id: Ie5cfe94ea18642c1bd5f4b7e3c92524407b85815
Pavel Maltsev [Wed, 4 Apr 2018 17:14:55 +0000 (10:14 -0700)]
Allow OEMs to restrict access to secondary display
This is crucial for automotive use-cases when OEMs want to restrict
access to instrument cluster display by third-party apps
Bug:
28864915
Bug:
70840956
Test: manually verify that secondary display with private flag is not
accessible by third-party apps and accessible to apps with system uid
Change-Id: I39e36c2ea73d879a4c7b01220ae852298d868fd5
Marco Nelissen [Mon, 2 Apr 2018 16:04:37 +0000 (09:04 -0700)]
Add @TestApi for field needed for test
Also update truncated comment.
Bug:
13249737
Bug:
77485791
Test: CTS
Change-Id: I1351a6ef28dfd7e881f32830c436315ffdbfffaa
Pavel Grafov [Thu, 5 Apr 2018 16:38:50 +0000 (09:38 -0700)]
Merge "Show work notifications in the shade unless on keyguard." into pi-dev
am:
b175d0db8f
Change-Id: I4840f60d8b9f98dee3f02ed88fbfc6e47c64dad1
Rohan Shah [Thu, 5 Apr 2018 16:34:12 +0000 (09:34 -0700)]
Merge "[QS] Update landscape UI" into pi-dev
am:
044a5e17da
Change-Id: I49ab03325cdb483ee5372df4ee8042dc225df850
Dongwon Kang [Thu, 5 Apr 2018 16:33:39 +0000 (16:33 +0000)]
Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev
Richard Ledley [Thu, 5 Apr 2018 12:39:43 +0000 (13:39 +0100)]
Add null check for Nullable argument.
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest FrameworksCoreTests:android.view.textclassifier.TextLinksTest
Bug:
77624093
Change-Id: I527c4e7f6758c699d4d4e7258cf8474f833040c7
Nicolas Geoffray [Thu, 5 Apr 2018 16:29:42 +0000 (17:29 +0100)]
Add new hidden APIs.
bug:
77527994
Test: m
Change-Id: Iebdab9d09c4d4531cfdfed6c3e363d68ed407ef1
Dan Gittik [Thu, 5 Apr 2018 16:27:10 +0000 (09:27 -0700)]
Merge "Added adb commands to set and reset brightness." into pi-dev
am:
0048eb210d
Change-Id: If2b04965975d6bbf8126f525d45ae0482dc33375
TreeHugger Robot [Thu, 5 Apr 2018 16:20:25 +0000 (16:20 +0000)]
Merge "Copy ApplicationInfo#versionCode field" into pi-dev
Milo Sredkov [Thu, 5 Apr 2018 16:20:00 +0000 (09:20 -0700)]
Merge "Require screen to be unlocked for smart replies" into pi-dev
am:
312a176a0b
Change-Id: I11d4eb66d036edb263717d21a3d4dde4047bb54b
Tracy Zhou [Thu, 5 Apr 2018 06:45:26 +0000 (23:45 -0700)]
Only move PIP window if PIP is not way above shelf/IME.
Change-Id: I650a94f40cd1ab0fbc40a2aaccce9d019ff0d6f1
Fixes:
77526420
Test: manual test
TreeHugger Robot [Thu, 5 Apr 2018 15:30:54 +0000 (15:30 +0000)]
Merge "Show work notifications in the shade unless on keyguard." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 15:29:27 +0000 (15:29 +0000)]
Merge "[QS] Update landscape UI" into pi-dev
Jan Althaus [Wed, 4 Apr 2018 11:56:40 +0000 (13:56 +0200)]
Makes TCS methods non-abstract
This only affects System API
Bug:
77563695
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextSelectionTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextLinksTestBug:
Change-Id: Ie927ffe3a4678b7a622c139a5431b89e8f22c6e4
Narayan Kamath [Thu, 5 Apr 2018 14:43:51 +0000 (15:43 +0100)]
resolve merge conflicts of
c8f5480981f987cb40989f387deeea360670f018 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0aa2671c54b0af4a6104e52aea0b5474922042fe
TreeHugger Robot [Thu, 5 Apr 2018 14:43:32 +0000 (14:43 +0000)]
Merge "Added adb commands to set and reset brightness." into pi-dev
Milo Sredkov [Thu, 5 Apr 2018 14:07:52 +0000 (14:07 +0000)]
Merge "Require screen to be unlocked for smart replies" into pi-dev
Leon Scroggins [Thu, 5 Apr 2018 13:45:25 +0000 (06:45 -0700)]
Merge "Add docs for setTargetSize and setTargetSampleSize" into pi-dev
am:
d9cb59629d
Change-Id: If2d4f604923ad74953733bb993420598c58e1e4b
TreeHugger Robot [Thu, 5 Apr 2018 13:41:17 +0000 (13:41 +0000)]
Merge "StrictMode: Add support for warning on non SDK API usage." into pi-dev
Leon Scroggins [Thu, 5 Apr 2018 13:29:38 +0000 (13:29 +0000)]
Merge "Add docs for setTargetSize and setTargetSampleSize" into pi-dev
Milo Sredkov [Wed, 4 Apr 2018 15:13:28 +0000 (16:13 +0100)]
Require screen to be unlocked for smart replies
Currently tapping on a smart reply works even when the screen is
locked. To make it consistent with inline replies, require the screen
to be unlocked before sending the reply.
Bug:
76217177
Test: atest SmartReplyViewTest
Change-Id: I3af8a0411537503650fb9f83cd99f65900e700e0
Dan Gittik [Wed, 28 Mar 2018 11:19:38 +0000 (12:19 +0100)]
Added adb commands to set and reset brightness.
adb shell cmd display set-brightness BRIGHTNESS command sets the
screen brightness programatically.
adb shell cmd display reset-brightness resets the brightness
configuration to the default configuration.
Test: run "adb shell cmd display set-brightness <number>" and watch
the magic happen.
Test: run "adb shell cmd jobscheduler run -f
com.google.android.apps.turbo 104" to push a new configuration,
then run "adb shell cmd display reset-brightness-configuration"
to reset it. If it's not noticable enough, you can manually
edit /data/system/display-manager-state.xml: for example, set
nits="0.0" for all the <brightness-point />s in the
<brightness-curve /> to make it as dark as posible.
Fixes:
77574628
Change-Id: I37e19c1e662370e60c9f616a3710780f16418620
Bernardo Rufino [Thu, 5 Apr 2018 11:38:46 +0000 (04:38 -0700)]
Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev
am:
c83cf90166
Change-Id: I0fbb92d38a7e711e01dc9c0860e16ef4e102ce6e
TreeHugger Robot [Thu, 5 Apr 2018 11:26:25 +0000 (11:26 +0000)]
Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev
Mathew Inwood [Thu, 5 Apr 2018 10:53:55 +0000 (03:53 -0700)]
Merge "Exempt platform-cert signed apps from hidden API checks." into pi-dev
am:
0e650c1c55
Change-Id: I79b6b7643f71928c65943744aa62b8a77d2749d1
Mathew Inwood [Thu, 5 Apr 2018 10:43:12 +0000 (10:43 +0000)]
Merge "Exempt platform-cert signed apps from hidden API checks." into pi-dev
Jaewan Kim [Thu, 5 Apr 2018 10:16:05 +0000 (03:16 -0700)]
Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev
am:
8a585a6f1f
Change-Id: I87994559dedfd8049f4de72131ed5653bfa631ef
Bernardo Rufino [Thu, 5 Apr 2018 10:03:39 +0000 (11:03 +0100)]
Catch IAE from unbind onServiceDisconnected()
We still don't know the underlying cause of this, but we shouldn't crash
the system_server. Catching for now.
Bug:
74940472
Bug:
77574274
Test: m -j RunFrameworksServicesRoboTests
Change-Id: I36fc2e65f8766f6b8fd68104d8830b72668d84eb
TreeHugger Robot [Thu, 5 Apr 2018 10:03:22 +0000 (10:03 +0000)]
Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev
Rubin Xu [Thu, 5 Apr 2018 09:54:53 +0000 (02:54 -0700)]
Merge "Device ID attestation: Add feature flag." into pi-dev
am:
73961397e5
Change-Id: I4488f26e579639a82ee9759e1202ec29add77245
Rubin Xu [Thu, 5 Apr 2018 09:38:28 +0000 (09:38 +0000)]
Merge "Device ID attestation: Add feature flag." into pi-dev
Makoto Onuki [Thu, 5 Apr 2018 07:39:07 +0000 (00:39 -0700)]
Merge "Don't call into phone process with lock held." into pi-dev
am:
4d289593f2
Change-Id: I66ba86186b67a18ddbfb7022a83c6fc979f080da
TreeHugger Robot [Thu, 5 Apr 2018 07:27:33 +0000 (07:27 +0000)]
Merge "Don't call into phone process with lock held." into pi-dev
Richard Ledley [Thu, 5 Apr 2018 05:58:17 +0000 (22:58 -0700)]
Merge "Use Collection instead of List for entity list" into pi-dev
am:
7b7e87eeb5
Change-Id: Ifac9afa0240c95134021a04bfb358f610a1cf073
Richard Ledley [Thu, 5 Apr 2018 05:46:53 +0000 (05:46 +0000)]
Merge "Use Collection instead of List for entity list" into pi-dev