OSDN Git Service
Etan Cohen [Thu, 15 Mar 2018 02:28:20 +0000 (02:28 +0000)]
Merge "[RTT][AWARE] Minor update to distance documentation" into pi-dev
am:
5e278aedfa
Change-Id: I0114ed6f3364d70f03875d77e45d669afc280a59
Christopher Tate [Thu, 15 Mar 2018 02:10:26 +0000 (02:10 +0000)]
Merge "Don't time out startForegroundService when debugging the app" into pi-dev
am:
17c8224c08
Change-Id: Id14c2392d8f792addab046e86b9c82396ca2cbe0
TreeHugger Robot [Thu, 15 Mar 2018 02:07:13 +0000 (02:07 +0000)]
Merge "[RTT][AWARE] Minor update to distance documentation" into pi-dev
Bo Zhu [Thu, 15 Mar 2018 01:58:37 +0000 (01:58 +0000)]
Merge "DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath" into pi-dev
am:
6168374715
Change-Id: I2e7ee415c2f5e7849065473cecac7235a18e5173
TreeHugger Robot [Thu, 15 Mar 2018 01:53:39 +0000 (01:53 +0000)]
Merge "Don't time out startForegroundService when debugging the app" into pi-dev
Robert Carr [Thu, 15 Mar 2018 01:43:43 +0000 (01:43 +0000)]
Merge changes I68dab076,Ife50c3d3,I705518be,I949fbe81 into pi-dev
am:
0a6e6e8911
Change-Id: Id4c5d4581bfc2aa08a3c6f351de1597b43cf20d3
TreeHugger Robot [Thu, 15 Mar 2018 01:36:24 +0000 (01:36 +0000)]
Merge "DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath" into pi-dev
Wale Ogunwale [Thu, 15 Mar 2018 01:35:24 +0000 (01:35 +0000)]
Merge "Added hackbod@ & ogunwale@ to display owners file." into pi-dev
am:
eca0aa82e2
Change-Id: Iff55c9d74936aa8f8ede0ff3b02ce353f6668e93
Suprabh Shukla [Thu, 15 Mar 2018 01:29:50 +0000 (01:29 +0000)]
Merge "Unhiding APIs in UsageEvents for public use" into pi-dev
am:
b33cef07f2
Change-Id: I6db57115f141dc3e84c89986c04a962d9bfe5b3f
Pengquan Meng [Thu, 15 Mar 2018 01:24:26 +0000 (01:24 +0000)]
Merge "Telephony(MSIM): Default NW mode property for each slot" into pi-dev
am:
c6556e7cb6
Change-Id: I19d61eecdf2032e004e124e9c086383779b734e2
TreeHugger Robot [Thu, 15 Mar 2018 01:16:09 +0000 (01:16 +0000)]
Merge changes I68dab076,Ife50c3d3,I705518be,I949fbe81 into pi-dev
* changes:
Disable move animations for ScreenDecor overlays.
WindowManager: Use WindowSurfaceController for seamless rotation
Prevent freezing the display while rotating seamlessly.
Eliminate usage of global transaction for display configuration.
Wale Ogunwale [Thu, 15 Mar 2018 01:16:05 +0000 (01:16 +0000)]
Merge "Added hackbod@ & ogunwale@ to display owners file." into pi-dev
Matthew Ng [Thu, 15 Mar 2018 01:15:07 +0000 (01:15 +0000)]
Merge changes from topic "centralize-quick-3s" into pi-dev
am:
6a9088e093
Change-Id: I8b066ae3cc23edd6cc7e5442bc5151985df51244
Matthew Ng [Thu, 15 Mar 2018 01:10:06 +0000 (01:10 +0000)]
Revert "Revert "Centralized quick step/scrub/switch logic (1/2)""
am:
2ea93b708d
Change-Id: Iea566c5e83acf561ac4112b0f594f965a7056097
TreeHugger Robot [Thu, 15 Mar 2018 01:08:33 +0000 (01:08 +0000)]
Merge "Unhiding APIs in UsageEvents for public use" into pi-dev
Wale Ogunwale [Thu, 15 Mar 2018 01:04:04 +0000 (18:04 -0700)]
Added hackbod@ & ogunwale@ to display owners file.
We need to be able to submit stuff while michaelwr@ is OOO.
For example: ag/
3690123
Test: can merge is stuff
Bug:
72038766
Change-Id: I1dd2260b54d95bbb6ebd27d871aeddfe3eefacdd
Pengquan Meng [Thu, 15 Mar 2018 01:01:15 +0000 (01:01 +0000)]
Merge "Telephony(MSIM): Default NW mode property for each slot" into pi-dev
Yohei Yukawa [Thu, 15 Mar 2018 00:54:22 +0000 (00:54 +0000)]
Merge "Also apply prefix when dumping isAllowedToUseHiddenApi" into pi-dev
am:
265b11ffb2
Change-Id: If24d9dfa23b4f5c3028ef08e6ccf454aede74519
TreeHugger Robot [Thu, 15 Mar 2018 00:53:19 +0000 (00:53 +0000)]
Merge changes from topic "centralize-quick-3s" into pi-dev
* changes:
Fixes crash on navbar using 3rd party launchers
Revert "Revert "Centralized quick step/scrub/switch logic (1/2)""
TreeHugger Robot [Thu, 15 Mar 2018 00:37:37 +0000 (00:37 +0000)]
Merge "Also apply prefix when dumping isAllowedToUseHiddenApi" into pi-dev
Andreas Gampe [Thu, 15 Mar 2018 00:10:22 +0000 (00:10 +0000)]
Merge changes I14df050f,I55c30f78,I269eae0f into pi-dev
am:
216c28d446 -s ours
Change-Id: I5f43a1d5ad23ffaf482dac2cb0aa91398932b23e
TreeHugger Robot [Wed, 14 Mar 2018 23:52:38 +0000 (23:52 +0000)]
Merge changes I14df050f,I55c30f78,I269eae0f into pi-dev
* changes:
Frameworks: Refactor FileDescriptorTable errors
Frameworks: Add app name to zygote abort
Frameworks: Refactor zygote abort code
Qingxi Li [Wed, 14 Mar 2018 23:24:44 +0000 (23:24 +0000)]
Merge "Add API to check extended APDU Supported" am:
fd4385e633
am:
19f487ec57 -s ours
Change-Id: I4216f0dddf533bab4d9db37cd1c8cc2e8555b71f
yro [Wed, 14 Mar 2018 23:21:17 +0000 (23:21 +0000)]
Merge "Add stats from storage manager to dumpsys result" into pi-dev
am:
8568931d6f
Change-Id: I0c27ed09388fb6be1abbbfb707b491feef70d6d9
Qingxi Li [Wed, 14 Mar 2018 23:17:14 +0000 (23:17 +0000)]
Merge "Add API to check extended APDU Supported"
am:
fd4385e633
Change-Id: I8f5441a58b8ca8b8aa2aa6138716c08749d6b814
Andrew Solovay [Wed, 14 Mar 2018 23:16:07 +0000 (23:16 +0000)]
Merge "docs: Javadoc typo fix" into pi-dev
am:
3731e47d23
Change-Id: I4b98269f78624f9dd62b859cad6977679f877f07
TreeHugger Robot [Wed, 14 Mar 2018 23:05:33 +0000 (23:05 +0000)]
Merge "Add stats from storage manager to dumpsys result" into pi-dev
Andrew Solovay [Wed, 14 Mar 2018 22:59:22 +0000 (22:59 +0000)]
Merge "docs: Javadoc typo fix" into pi-dev
Todd Kennedy [Wed, 14 Mar 2018 22:41:23 +0000 (22:41 +0000)]
Merge "Enable local search for instant apps" into pi-dev
am:
35a6c58325
Change-Id: I6c459808616cb8aa400f5c98d329696afefa905a
Felipe Leme [Wed, 14 Mar 2018 22:36:19 +0000 (22:36 +0000)]
Merge "Improved Application.getAutofillClient()" into pi-dev
am:
070db35bfb
Change-Id: I3deb8585d4901b267d3071d678f0a3cfcb5539f8
TreeHugger Robot [Wed, 14 Mar 2018 22:23:24 +0000 (22:23 +0000)]
Merge "Enable local search for instant apps" into pi-dev
Android Build Merger (Role) [Wed, 14 Mar 2018 22:16:13 +0000 (22:16 +0000)]
Merge "Merge "Add ability to filter remote animation adapter by activity type" into pi-dev am:
c175631670" into pi-dev-plus-aosp
Jorim Jaggi [Wed, 14 Mar 2018 22:15:40 +0000 (22:15 +0000)]
Merge "Add ability to filter remote animation adapter by activity type" into pi-dev
am:
c175631670
Change-Id: I12c6890345fe5cc41f717bb8e9cc1c6248298dd8
yinxu [Wed, 14 Mar 2018 22:13:40 +0000 (22:13 +0000)]
Merge "Catch the RuntimeException for stopScan()" am:
0715570648
am:
ca8b90d7e0 -s ours
Change-Id: I09b70ab24e2a552b8c984e9067f9f9d721435811
Bo Zhu [Fri, 9 Mar 2018 20:32:13 +0000 (12:32 -0800)]
DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath
I forgot to serialize and deserialize it in the last CL adding it.
Bug:
74359698
Change-Id: I34f9225dc63b55223c2a7db23ee3fa6abf056a0d
Test: atest RecoveryControllerHostTest
(cherry picked from commit
b4d2cc684dcd94a1482c8c2e66d421d481032833)
TreeHugger Robot [Wed, 14 Mar 2018 22:02:10 +0000 (22:02 +0000)]
Merge "Improved Application.getAutofillClient()" into pi-dev
Kweku Adams [Wed, 14 Mar 2018 22:02:03 +0000 (22:02 +0000)]
Merge "incidentd: cleaning up settings.proto" into pi-dev
am:
41b5ece135
Change-Id: Ic1fd23d00921e373219701623175924fe09d618d
Treehugger Robot [Wed, 14 Mar 2018 21:59:58 +0000 (21:59 +0000)]
Merge "Add API to check extended APDU Supported"
yinxu [Wed, 14 Mar 2018 21:56:40 +0000 (21:56 +0000)]
Merge "Catch the RuntimeException for stopScan()"
am:
0715570648
Change-Id: I751b4640654826499a9885db657bc0f4da2358f1
Aseem Kumar [Wed, 14 Mar 2018 21:55:55 +0000 (21:55 +0000)]
Merge "Disable RecoverableKeyStoreManager for custom lockscreens." into pi-dev
am:
1c4d0287c5
Change-Id: I9d808f184b1b0cc2686953bed70977619a45284b
Jorim Jaggi [Wed, 14 Mar 2018 21:55:07 +0000 (21:55 +0000)]
Merge "Add ability to filter remote animation adapter by activity type" into pi-dev
Julia Reynolds [Wed, 14 Mar 2018 21:48:32 +0000 (21:48 +0000)]
Merge changes Iaf63b4e8,Ie76044d4 into pi-dev
am:
a60e6f81df
Change-Id: I3d325f078078abbeb4f949271ca45fe1e04f02b4
TreeHugger Robot [Wed, 14 Mar 2018 21:31:32 +0000 (21:31 +0000)]
Merge "incidentd: cleaning up settings.proto" into pi-dev
Aseem Kumar [Wed, 14 Mar 2018 21:29:12 +0000 (21:29 +0000)]
Merge "Disable RecoverableKeyStoreManager for custom lockscreens." into pi-dev
Suprabh Shukla [Fri, 9 Mar 2018 02:34:15 +0000 (18:34 -0800)]
Unhiding APIs in UsageEvents for public use
These apis are needed to interpret standby bucket change history
when using UsageStatsManager#queryEventsForSelf
Test: atest android.app.usage.cts.UsageStatsTest#testQueryEventsForSelf
Bug:
71906213
Change-Id: Ib9f458bf32089ad30c97eca9dd5cc4df5a392191
Eric Schwarzenbach [Wed, 14 Mar 2018 21:26:00 +0000 (21:26 +0000)]
Merge "Add Duplex mode to ServiceState." into pi-dev
am:
8062b76f21 -s ours
Change-Id: I1e1f6bfffdd074ea1d6cfb28a0d471b4ce435041
TreeHugger Robot [Wed, 14 Mar 2018 21:25:23 +0000 (21:25 +0000)]
Merge changes Iaf63b4e8,Ie76044d4 into pi-dev
* changes:
Change DND upgrade noti text and channel
Reevaluate volume settings toggle onShow.
Matthew Ng [Wed, 14 Mar 2018 19:26:14 +0000 (12:26 -0700)]
Fixes crash on navbar using 3rd party launchers
When using a 3rd party launcher, the touch service
connection from pixel launcher and system ui is
disconnecting causing the nav bar to crash when
tapping it because onTouchIntercept returns true
from a NavigationBarView and handles the
onTouchEvent that does not check for a valid
connection. Check for a valid connection to
launcher service in onTouchEvent and before
proxying data to prevent the crash.
Fixes:
74726495
Test: change to 3rd party launcher press nav bar
Change-Id: I6f7efe78599b0829fd90aa0436463e77ec51f634
Kelly Rossmoyer [Wed, 14 Mar 2018 21:13:37 +0000 (21:13 +0000)]
Merge "Increase size of BatteryStatsService stats buffer" into pi-dev
am:
db56e7b949
Change-Id: Ibe2cf8b5394ba7b2380459f5e95d93f286d49326
Torne (Richard Coles) [Wed, 14 Mar 2018 21:06:21 +0000 (21:06 +0000)]
Merge "Start the webview_zygote at boot, but in the background." into pi-dev
am:
ea50ff85e8
Change-Id: Ibb64aa53c366d473a131998af409784add519be7
Eric Schwarzenbach [Wed, 14 Mar 2018 21:05:43 +0000 (21:05 +0000)]
Merge "Add Duplex mode to ServiceState." into pi-dev
yinxu [Wed, 14 Mar 2018 21:00:49 +0000 (21:00 +0000)]
Merge "Fix a bug when calling onError(int)" am:
d116852e69
am:
aa98102fa3 -s ours
Change-Id: Ia2c737e06a8ce2adc4f8ecbccfa7ff76387afd88
yinxu [Wed, 14 Mar 2018 20:53:38 +0000 (20:53 +0000)]
Merge "Fix a bug when calling onError(int)"
am:
d116852e69
Change-Id: Ic55c4b394a97686c77da0652b751d3712b730446
Matthew Ng [Wed, 14 Mar 2018 19:43:18 +0000 (19:43 +0000)]
Revert "Revert "Centralized quick step/scrub/switch logic (1/2)""
This reverts commit
0e490d9208de480ed38fe31a12029fc59b0955e9.
Reason for revert: Will be merged with fix
Bug:
74726495
Test: manual
Change-Id: I36ea9c2702107b23eff4adb1f3ba9fdc1be12999
Etan Cohen [Wed, 14 Mar 2018 20:49:43 +0000 (13:49 -0700)]
[RTT][AWARE] Minor update to distance documentation
Clarify that measured distance may be negative.
Bug:
63446747
Test: builds
Change-Id: Iff73c1e22dcf98dfce6fc69b7c9d4cf8a05af8d7
Derek Sollenberger [Wed, 14 Mar 2018 20:48:59 +0000 (20:48 +0000)]
Merge "Document the byte packing order of the current Bitmap.Configs" into pi-dev
am:
13cd2c9227
Change-Id: Icf0b3878d1ef5ead82df739f4781d6782b46ee92
Yohei Yukawa [Wed, 14 Mar 2018 20:43:47 +0000 (13:43 -0700)]
Also apply prefix when dumping isAllowedToUseHiddenApi
This is a follow up CL to a CL [1] that added one more state dump from
ApplicationInfo regarding whether the app is exampted from the API
restriction but forgot to take care of prefix handling.
[1]: I01e837253d00c6ffa841a9e5c226204a3e11b827
974290b032b4d98603925d36851422986a5d7d0e
Bug:
64382372
Test: Ran the following command to see "isAllowedToUseHiddenApi"
is aligned with other outputs from ApplicationInfo.
adb shell ime list -a
Change-Id: I9c77d9b557245b7f3b51631140bd564feef601ce
Kelly Rossmoyer [Wed, 14 Mar 2018 20:43:14 +0000 (20:43 +0000)]
Merge "Increase size of BatteryStatsService stats buffer" into pi-dev
Jason Monk [Wed, 14 Mar 2018 20:41:12 +0000 (20:41 +0000)]
Merge "Add API to get currently pinned slices" into pi-dev
am:
98c1d17cb4
Change-Id: Ie71c82c8cc7734cf123adbc6342ca4154c04ba53
TreeHugger Robot [Wed, 14 Mar 2018 20:32:32 +0000 (20:32 +0000)]
Merge "Start the webview_zygote at boot, but in the background." into pi-dev
Todd Kennedy [Wed, 14 Mar 2018 15:09:00 +0000 (08:09 -0700)]
Enable local search for instant apps
When getting the set of searchable activities, fetch instant
applications. But, this means that the set needs a final
filter to prevent leaking application existence.
Change-Id: I6b9daf031ce54061c4500d9edae1d738848158c4
Fixes:
68211791
Test: atest -it CtsAppSecurityHostTestCases:EphemeralTest#testGetSearchableInfo
(cherry picked from commit
8b9d664cae1681c6107bd6caf807e786f96190ca)
TreeHugger Robot [Wed, 14 Mar 2018 20:23:29 +0000 (20:23 +0000)]
Merge "Document the byte packing order of the current Bitmap.Configs" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 20:12:54 +0000 (20:12 +0000)]
Merge "Add API to get currently pinned slices" into pi-dev
Felipe Leme [Wed, 14 Mar 2018 19:33:58 +0000 (12:33 -0700)]
Improved Application.getAutofillClient()
- Fixed usage of activity instead of record.activity
- Added (optional) verbose logging
Bug:
74793485
Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityTest#testAutofill_appContext\
CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest#testAutofill_appContext
Change-Id: I03721cab6428e580b13444bf045f33dc3d787a8d
Winson Chung [Wed, 14 Mar 2018 19:55:50 +0000 (19:55 +0000)]
Merge "Revert "Centralized quick step/scrub/switch logic (1/2)"" into pi-dev
am:
6d4bdc5381
Change-Id: I495db8f2f7b14eacff75a0ec06f7ada01c208ddd
Treehugger Robot [Wed, 14 Mar 2018 19:47:44 +0000 (19:47 +0000)]
Merge "Catch the RuntimeException for stopScan()"
Treehugger Robot [Wed, 14 Mar 2018 19:46:51 +0000 (19:46 +0000)]
Merge "Fix a bug when calling onError(int)"
yro [Wed, 14 Mar 2018 01:08:09 +0000 (18:08 -0700)]
Add stats from storage manager to dumpsys result
Bug:
74601313
Test: manual test, statsd_test
Change-Id: Ifdde6bb10d29f3983b0c27a66a6e30f1f40308ee
Winson Chung [Wed, 14 Mar 2018 19:42:13 +0000 (19:42 +0000)]
Merge "Revert "Centralized quick step/scrub/switch logic (1/2)"" into pi-dev
Winson Chung [Wed, 14 Mar 2018 16:08:43 +0000 (16:08 +0000)]
Revert "Centralized quick step/scrub/switch logic (1/2)"
This reverts commit
b06ae3bf131b0bd0ded398d3a06974a6a9d78a50.
Reason for revert: b/
74726495
Bug:
74726495
Change-Id: I4bce8df13f9fa9e1b420382f7a96f9855510196f
Andrew Solovay [Mon, 12 Mar 2018 22:11:50 +0000 (15:11 -0700)]
docs: Javadoc typo fix
Doc is staged to:
http://go/dac-stage/reference/android/webkit/WebView.html
Exempt-From-Owner-Approval: Doc-only change
Bug:
20926682
Test: make ds-docs
Change-Id: Ib966923b75c8a70da5415f38e4217caeecc44cbe
Merged-In: Ib966923b75c8a70da5415f38e4217caeecc44cbe
Yangster-mac [Wed, 14 Mar 2018 19:17:15 +0000 (19:17 +0000)]
Merge "Add wall clock timestamp for ConfigMetricsReport and gauge atoms." into pi-dev
am:
c7ce1a0978
Change-Id: I4b0d77eee36c49a4d328d910c7eaa320b5cd940b
Aseem Kumar [Tue, 13 Mar 2018 01:05:16 +0000 (18:05 -0700)]
Disable RecoverableKeyStoreManager for custom lockscreens.
Bug:
74225107
Test: adb shell am instrument \
-w -e package com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I88fc0fe7fdb23439d781cac96632196465553a38
Yao Chen [Wed, 14 Mar 2018 19:04:42 +0000 (19:04 +0000)]
Merge "Remove unused shared lib from statsd" into pi-dev
am:
a9e73469c5
Change-Id: I7782ae86ab9d587bb1f3a88f3d4fe1df63cc5dea
Robert Carr [Wed, 14 Mar 2018 18:51:23 +0000 (11:51 -0700)]
Disable move animations for ScreenDecor overlays.
They look pretty weird during seamless rotation.
Bug:
72038766
Test: Manual.
Change-Id: I68dab0761a9faca42324e64a545477302c6e3bbe
TreeHugger Robot [Wed, 14 Mar 2018 19:03:06 +0000 (19:03 +0000)]
Merge "Add wall clock timestamp for ConfigMetricsReport and gauge atoms." into pi-dev
Robert Carr [Wed, 14 Mar 2018 18:50:52 +0000 (11:50 -0700)]
WindowManager: Use WindowSurfaceController for seamless rotation
Otherwise we run in to the issues with the cache when exiting
seamless rotation.
Bug:
72038766
Test: Manual. go/wm-smoke
Change-Id: Ife50c3d3a77fbcfe9d8a7ef40c45444bbb8b4e93
Robert Carr [Fri, 16 Feb 2018 19:46:16 +0000 (11:46 -0800)]
Prevent freezing the display while rotating seamlessly.
Following recent changes we are now receiving WindowManagerService#reconfigureDisplayLocked
during rotation. This is interpreted as another change in display
configuration that requires screen freezing and we continue on to startFreezingDisplayLocked.
This triggers the screenshot based freezing, but we were already trying to seamlessly rotate.
It seems a sensible solution to just disable screenshot based freezing while seamlessly as
we now disable screenshot based freezing while already using it.
Bug:
72038766
Test: Manual. go/wm-smoke.
Change-Id: I705518be11302cfaa95207e3b3d0c7e93e54ebbf
Robert Carr [Thu, 15 Feb 2018 23:36:23 +0000 (15:36 -0800)]
Eliminate usage of global transaction for display configuration.
For seamless rotation to work in the brave new world we need the setting
of the display projection to occur in the same transaction as the
reconfiguration of the stack SurfaceControl. To understand this simply see
that the inverse rotation for seamless rotation happens at the
WindowStateAnimator level so if the stack bounds weren't updated to the new
rotation we would clip. This means: We need to use the pending transaction.
We also need to port the rotation animation to use the pending transaction
as it needs to perform transactions at the same time as setting the display
projection. A pleasant consequence is we can eliminate some "inTransaction"
code-paths that always seemed to be a bit of a wart.
Bug:
72038766
Test: Manual. go/wm-smoke.
Change-Id: I949fbe8150d452c1ef5c13e704ddf87269f824f3
Felipe Leme [Wed, 14 Mar 2018 18:58:23 +0000 (18:58 +0000)]
Merge "Removed redundant method ContentResolver.releasePersistableUriPermission()" into pi-dev
am:
5741823729
Change-Id: I28d34b535431f01abbe8c618e17c891be2df3f87
Sandeep Gutta [Wed, 16 Mar 2016 16:07:25 +0000 (21:37 +0530)]
Telephony(MSIM): Default NW mode property for each slot
For dual SIM devices, add provision to configure different default
Network modes for each slot, using the existing system property to
configure this default network modes.
Bug:
28384694
Test: manual - Checked different default NW mode can be set
for each slot.
Merged-Id: I72b11522cb51a425e28ddc407014387a20cb2cd7
Change-Id: I72b11522cb51a425e28ddc407014387a20cb2cd7
Alan Viverette [Wed, 14 Mar 2018 18:48:58 +0000 (18:48 +0000)]
[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am:
f3c2e0b3ab am:
1b6f3f9a97 am:
d0fcb49352 skipped:
93f8bfa5c4 am:
e32e8229b3 am:
f98157e2ba am:
4f83bad908 am:
a982645d5c skipped:
9d3e228729 am:
8a095b5f19 am:
0886b1a751 am:
25d38a56ae -s ours
am:
4193248668
Change-Id: Ie563bccdbfe1a6efa4b80befd10abef2e60bc306
TreeHugger Robot [Wed, 14 Mar 2018 18:48:20 +0000 (18:48 +0000)]
Merge "Remove unused shared lib from statsd" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 18:42:38 +0000 (18:42 +0000)]
Merge "Removed redundant method ContentResolver.releasePersistableUriPermission()" into pi-dev
yinxu [Mon, 12 Mar 2018 21:07:49 +0000 (14:07 -0700)]
Fix a bug when calling onError(int)
The lambda expression is executed on executor, so it is possible that
the message has been updated. The correct way is to fetch the
message.arg1 and use that value in the lamda expression.
This is a clean cherry-pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/
3725360
Bug:
73750871
Test: Unit Test
Change-Id: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
Merged-in: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
(cherry picked from commit
db18cdae661b87ff2de3847947906da735f8d5eb)
yinxu [Mon, 12 Mar 2018 22:55:28 +0000 (15:55 -0700)]
Catch the RuntimeException for stopScan()
Some RuntimeExceptions will be thrown across the binder so we need to
catch RuntimeException even we already catch the RemoteException.
This is a clean cherry-pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/
3725821
Bug:
73750871
Test: Unit Test
Change-Id: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
Merged-in: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
(cherry picked from commit
7ea1a49c0aa1bb9bd990060a193507e5e4d0c292)
Andreas Gampe [Wed, 14 Mar 2018 18:30:51 +0000 (18:30 +0000)]
Merge changes I14df050f,I55c30f78,I269eae0f am:
ad7415f11e
am:
3dd16b1eaf
Change-Id: I82179683643a71298d71dd3cbf6916141ba2b2a7
Andreas Gampe [Wed, 14 Mar 2018 18:10:20 +0000 (18:10 +0000)]
Merge changes I14df050f,I55c30f78,I269eae0f
am:
ad7415f11e
Change-Id: I3754b49159f7e23df8e95b03b3b88cc0908d554e
Alan Viverette [Wed, 14 Mar 2018 18:09:51 +0000 (18:09 +0000)]
[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am:
f3c2e0b3ab am:
1b6f3f9a97 am:
d0fcb49352 skipped:
93f8bfa5c4 am:
e32e8229b3 am:
f98157e2ba am:
4f83bad908 am:
a982645d5c skipped:
9d3e228729 am:
8a095b5f19 am:
0886b1a751
am:
25d38a56ae -s ours
Change-Id: I0bf700a857b7eba5aebf66e0c2f7970234d7ac00
Antony Sargent [Wed, 14 Mar 2018 18:02:55 +0000 (18:02 +0000)]
Merge "Update comment for HAPTIC_FEEDBACK_ENABLED setting" into pi-dev
am:
d357342a4a
Change-Id: Iba13007a1682d45c15c57401e7965188139e8272
Alan Viverette [Wed, 14 Mar 2018 17:58:15 +0000 (17:58 +0000)]
[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am:
f3c2e0b3ab am:
1b6f3f9a97 am:
d0fcb49352 skipped:
93f8bfa5c4 am:
e32e8229b3 am:
f98157e2ba am:
4f83bad908 am:
a982645d5c skipped:
9d3e228729 am:
8a095b5f19
am:
0886b1a751
Change-Id: I6fb6521317ef9d9e2d6afab056bc8993bed9720c
Winson Chung [Wed, 14 Mar 2018 17:50:41 +0000 (17:50 +0000)]
Merge "Update old stack check for finding recent task index to remove" into pi-dev
am:
c5b7930b8a
Change-Id: I96a9b2d7ea8f5155bb725c302df51fb3af6fb465
Alan Viverette [Wed, 14 Mar 2018 17:39:54 +0000 (17:39 +0000)]
[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am:
f3c2e0b3ab am:
1b6f3f9a97 am:
d0fcb49352 skipped:
93f8bfa5c4 am:
e32e8229b3 am:
f98157e2ba am:
4f83bad908 am:
a982645d5c skipped:
9d3e228729
am:
8a095b5f19
Change-Id: I6eb246ce670723e1f21ee4cf45d5c5e48b91f1ce
Fyodor Kupolov [Wed, 14 Mar 2018 17:35:54 +0000 (17:35 +0000)]
Merge "Added performance tests for SQLiteCursor iteration" into pi-dev
am:
86db3b5c10
Change-Id: I397c7696b69a01e18465f31d167187a6fcb71fd1
Andreas Gampe [Mon, 12 Mar 2018 21:53:34 +0000 (14:53 -0700)]
Frameworks: Refactor FileDescriptorTable errors
Surface error messages to the caller.
(cherry picked from commit
183a5d3cfa6bcdc817dfe6e5512fb6912bb44583)
Bug:
74531335
Test: m
Test: Device boots
Merged-In: I14df050feb7f5417bb08d190492c3050cdbb1c1d
Change-Id: I14df050feb7f5417bb08d190492c3050cdbb1c1d
Andreas Gampe [Mon, 12 Mar 2018 19:17:25 +0000 (12:17 -0700)]
Frameworks: Add app name to zygote abort
If possible, add the target process name to the zygote abort.
(cherry picked from commit
bf94c2c1d789cbe0be77a70536dc08d6f0bd7e5c)
Bug:
74531335
Test: m
Test: Device boots
Test: Manual - fake a failure
Merged-In: I55c30f78246876fdc1b822056351dbbb14c1247e
Change-Id: I55c30f78246876fdc1b822056351dbbb14c1247e
Andreas Gampe [Mon, 12 Mar 2018 19:08:55 +0000 (12:08 -0700)]
Frameworks: Refactor zygote abort code
Fail in the main fork function. This will simplify follow-ups that
will include more data in the abort.
(cherry picked from commit
b8aae1969c6b8f9ac420745166edcd6c9fe59717)
Bug:
74531335
Test: m
Test: Device boots
Merged-In: I269eae0fb15e96fb27d02d4b7c6fdf7e9e8e3346
Change-Id: I269eae0fb15e96fb27d02d4b7c6fdf7e9e8e3346
TreeHugger Robot [Wed, 14 Mar 2018 17:32:43 +0000 (17:32 +0000)]
Merge "Update comment for HAPTIC_FEEDBACK_ENABLED setting" into pi-dev
Derek Sollenberger [Wed, 14 Mar 2018 17:26:47 +0000 (13:26 -0400)]
Document the byte packing order of the current Bitmap.Configs
This CL documents the byte order for 585, 8888, and fp16 buffers.
Test: documenting existing behavior
Bug:
71518511
Change-Id: I128344db318eb4597b6eb00f0ae317e369145152
Winson Chung [Wed, 14 Mar 2018 17:28:46 +0000 (17:28 +0000)]
Merge "Update old stack check for finding recent task index to remove" into pi-dev
OSDN Git Service
