OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Wait with reparenting back until all app animations are done" into pi-dev
Jorim Jaggi [Wed, 21 Mar 2018 01:04:00 +0000 (01:04 +0000)]
Merge "Wait with reparenting back until all app animations are done" into pi-dev
am: 475fe3f13b

Change-Id: If88d3ff52402d14e5ae5eb4d8f4d1e849f6f9507

6 years agoMerge "Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION" into pi-dev
Eino-Ville Talvala [Wed, 21 Mar 2018 00:51:15 +0000 (00:51 +0000)]
Merge "Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION" into pi-dev
am: 1486849e8b

Change-Id: Ie4195451c9c0084973dc0c1f758eb81c99977f96

6 years agoMerge "Fix cutoff g in "Restarting"/"Shutting down" messages." into pi-dev
Alison Cichowlas [Wed, 21 Mar 2018 00:45:11 +0000 (00:45 +0000)]
Merge "Fix cutoff g in "Restarting"/"Shutting down" messages." into pi-dev
am: cf06ca0ec4

Change-Id: I695e7ca7c8f69cbfe2378b5c0aa13e1a18ac67b6

6 years agoMerge "Revert "Revert "Add setting for enabling CPU frequency scaling.""" into pi-dev
Alice Sheng [Wed, 21 Mar 2018 00:35:28 +0000 (00:35 +0000)]
Merge "Revert "Revert "Add setting for enabling CPU frequency scaling.""" into pi-dev
am: 0b08926fcb

Change-Id: I6c9f7f24761d0add22953083cb7f0b0f8c7988cb

6 years agoMerge "[DO NOT MERGE] Eliminate duplicate layers in A11yService#getWindows()" into...
Eugene Susla [Wed, 21 Mar 2018 00:27:39 +0000 (00:27 +0000)]
Merge "[DO NOT MERGE] Eliminate duplicate layers in A11yService#getWindows()" into pi-dev
am: fa23f8e30e

Change-Id: I487a4aaaa069398f0ae7ea28b3dc988d2832aa2a

6 years agoMerge "[DO NOT MERGE] Magnify status bar" into pi-dev
Eugene Susla [Wed, 21 Mar 2018 00:24:45 +0000 (00:24 +0000)]
Merge "[DO NOT MERGE] Magnify status bar" into pi-dev
am: e649106c74

Change-Id: I20d3593f5d9b93997c5dc908c58a51ec62669ff6

6 years agoMerge "Log visual interruptions to usagestats." into pi-dev
Julia Reynolds [Wed, 21 Mar 2018 00:08:39 +0000 (00:08 +0000)]
Merge "Log visual interruptions to usagestats." into pi-dev
am: 1c7c2bdd0b

Change-Id: I3a6497fbdddc5f728c5702f1a60e479d99fd7277

6 years agoMerge "Make SYSTEM_INTERACTION a SystemApi" into pi-dev
Michael Wachenschwanz [Wed, 21 Mar 2018 00:03:53 +0000 (00:03 +0000)]
Merge "Make SYSTEM_INTERACTION a SystemApi" into pi-dev
am: 06ce5f6803

Change-Id: Ieef7dc8027f0c81b8dfafa08b3d626adf3cfe75f

6 years agoMerge "Remove Make side (system/test-)api-stubs droiddoc targets" into pi-dev-plus...
TreeHugger Robot [Tue, 20 Mar 2018 23:29:12 +0000 (23:29 +0000)]
Merge "Remove Make side (system/test-)api-stubs droiddoc targets" into pi-dev-plus-aosp

6 years agoRemove Make side (system/test-)api-stubs droiddoc targets
Nan Zhang [Tue, 13 Mar 2018 23:16:34 +0000 (16:16 -0700)]
Remove Make side (system/test-)api-stubs droiddoc targets

Remove old droiddoc targets for api-stubs, system-api-stubs, and test-api-stubs.

And also set api_tag_name, api_filename, private_api_filename, and etc.
properties in Android.bp for new droiddoc.
Test: manually compare if dependencies change after Soong based droiddoc runs.
Bug: b/70351683

Change-Id: I8d944c83de120ec8148276adc1c9872113d9d29b
Merged-In: I8d944c83de120ec8148276adc1c9872113d9d29b

6 years agoMerge "Fixed Save logic so it's not triggered when field was not autofilled." into...
Felipe Leme [Tue, 20 Mar 2018 23:22:14 +0000 (23:22 +0000)]
Merge "Fixed Save logic so it's not triggered when field was not autofilled." into pi-dev
am: 651667cea1

Change-Id: Ic451775af3bf26f9f34f5f4e3e09ed88d1d3121f

6 years agoMerge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" into pi-dev
Brad Ebinger [Tue, 20 Mar 2018 23:14:52 +0000 (23:14 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" into pi-dev
am: 22159e86d3  -s ours

Change-Id: If70955f541c52cf6114f1b3201fee8485554af76

6 years agoMerge "Minor changes to the API to align the choice of password hashing algorithm...
Bo Zhu [Tue, 20 Mar 2018 23:11:22 +0000 (23:11 +0000)]
Merge "Minor changes to the API to align the choice of password hashing algorithm" into pi-dev
am: cb686a19e6

Change-Id: I762ca84a7a3f87a729fb38c5182bfd8a4e82d826

6 years agoMerge "Update lockdown icon color" into pi-dev
Chad Brubaker [Tue, 20 Mar 2018 23:08:02 +0000 (23:08 +0000)]
Merge "Update lockdown icon color" into pi-dev
am: e248eeebc2

Change-Id: I8bb6be657339333cca57700cf421a5f875758cc4

6 years agoMerge "Don't throw exception for duplicate stop" into pi-dev
Andrii Kulian [Tue, 20 Mar 2018 23:03:57 +0000 (23:03 +0000)]
Merge "Don't throw exception for duplicate stop" into pi-dev
am: 002e0ef06e

Change-Id: I70a17eb1b923871536721aa77442a85d18b49c74

6 years agoMerge "Remove BLE App entry from mBleApps list when App died" am: 1a99d557e1
Stanley Tng [Tue, 20 Mar 2018 22:52:39 +0000 (22:52 +0000)]
Merge "Remove BLE App entry from mBleApps list when App died" am: 1a99d557e1
am: 20dcf997ba

Change-Id: I17cd9d02357c5ed39d6bf5fa919dc35d3dfc1554

6 years agoMerge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." am:...
Jeff Davidson [Tue, 20 Mar 2018 22:35:35 +0000 (22:35 +0000)]
Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." am: 88826dceef
am: 572fecfc81  -s ours

Change-Id: Id445462b8b98a52465976c74126e7ebc9ad66c67

6 years agoMerge "Add support for auth-only transforms" am: 275749c0b2
Benedict Wong [Tue, 20 Mar 2018 22:28:27 +0000 (22:28 +0000)]
Merge "Add support for auth-only transforms" am: 275749c0b2
am: 51ca645608

Change-Id: I8a8a89c40ab97b81225520b80950937b11863134

6 years agoMerge "Remove BLE App entry from mBleApps list when App died"
Stanley Tng [Tue, 20 Mar 2018 22:16:01 +0000 (22:16 +0000)]
Merge "Remove BLE App entry from mBleApps list when App died"
am: 1a99d557e1

Change-Id: I85bd3a4c0bd1ef0fe91341b7193941bef24b2013

6 years agoMerge "Fix default permission granting for system TextClassifier." into pi-dev
Ye Wen [Tue, 20 Mar 2018 22:12:29 +0000 (22:12 +0000)]
Merge "Fix default permission granting for system TextClassifier." into pi-dev
am: 07b7913124

Change-Id: Ib8a69e230c5e15928f5d2248262f02860b2e4916

6 years agoMerge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps."
Jeff Davidson [Tue, 20 Mar 2018 22:09:57 +0000 (22:09 +0000)]
Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps."
am: 88826dceef

Change-Id: I11e1f761955aa2b2419aa942ec3068e7adc26d2f

6 years agoMerge "Add support for auth-only transforms"
Benedict Wong [Tue, 20 Mar 2018 22:06:30 +0000 (22:06 +0000)]
Merge "Add support for auth-only transforms"
am: 275749c0b2

Change-Id: I75a4f75f7c8d0de40da329d4c0a86d546ee9fcb2

6 years agoMerge "Remove unused string." into pi-dev
Amin Shaikh [Tue, 20 Mar 2018 22:05:00 +0000 (22:05 +0000)]
Merge "Remove unused string." into pi-dev
am: 20b7c174c2

Change-Id: I61902fe030db38e054c3de665350a38835218524

6 years agoMerge "Wait with reparenting back until all app animations are done" into pi-dev
Jorim Jaggi [Tue, 20 Mar 2018 22:01:10 +0000 (22:01 +0000)]
Merge "Wait with reparenting back until all app animations are done" into pi-dev

6 years agoMerge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort...
Xi Han [Tue, 20 Mar 2018 22:00:36 +0000 (22:00 +0000)]
Merge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity." into pi-dev
am: cd6bb7242c

Change-Id: I92b19d3aa66088e65736e5562cb40881c9aa954d

6 years agoWait with reparenting back until all app animations are done
Jorim Jaggi [Mon, 19 Mar 2018 13:53:23 +0000 (14:53 +0100)]
Wait with reparenting back until all app animations are done

An activity A that has a shorter animation that is above another
activity B with a longer animation in the same task, the animation
layer would put the B on top of A, but from the hierarchy, A needs
to be on top of B. Thus, we defer reparenting A to the original
hierarchy such that it stays on top of B until B finishes
animating.

Test: Above scenario
Test: AnimatingAppWindowTokenRegistryTest
Fixes: 75246892
Change-Id: I73796376c1cbeb8327262a304911ce2abfbbb0b6

6 years agoMerge "Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION" into pi-dev
Eino-Ville Talvala [Tue, 20 Mar 2018 21:58:15 +0000 (21:58 +0000)]
Merge "Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION" into pi-dev

6 years agoMerge "Fix cutoff g in "Restarting"/"Shutting down" messages." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 21:58:01 +0000 (21:58 +0000)]
Merge "Fix cutoff g in "Restarting"/"Shutting down" messages." into pi-dev

6 years agoMerge "Revert "Revert "Add setting for enabling CPU frequency scaling.""" into pi-dev
Alice Sheng [Tue, 20 Mar 2018 21:56:40 +0000 (21:56 +0000)]
Merge "Revert "Revert "Add setting for enabling CPU frequency scaling.""" into pi-dev

6 years agoMerge "Moves the settings changed logging for statsd." into pi-dev
David Chen [Tue, 20 Mar 2018 21:56:32 +0000 (21:56 +0000)]
Merge "Moves the settings changed logging for statsd." into pi-dev
am: 039deb4390

Change-Id: Id6608886444ee040fb23e1106f29903971b9be0d

6 years agoMerge "Expose if running a11y service has crashed" into pi-dev
Phil Weaver [Tue, 20 Mar 2018 21:51:12 +0000 (21:51 +0000)]
Merge "Expose if running a11y service has crashed" into pi-dev
am: c863d506cf

Change-Id: I032c524115ca3863d5fe08a843dbe9febce27c76

6 years agoMerge "Handle PDFium API change" into pi-dev
Philip P. Moltmann [Tue, 20 Mar 2018 21:47:38 +0000 (21:47 +0000)]
Merge "Handle PDFium API change" into pi-dev
am: 173d0e9b34

Change-Id: Iafba2d3de659e740be244cc506e6ecf770b0e079

6 years agoMerge "[DO NOT MERGE] Eliminate duplicate layers in A11yService#getWindows()" into...
TreeHugger Robot [Tue, 20 Mar 2018 21:46:40 +0000 (21:46 +0000)]
Merge "[DO NOT MERGE] Eliminate duplicate layers in A11yService#getWindows()" into pi-dev

6 years agoMerge "[DO NOT MERGE] Magnify status bar" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 21:39:52 +0000 (21:39 +0000)]
Merge "[DO NOT MERGE] Magnify status bar" into pi-dev

6 years agoMerge "Merge "Updating javadoc for updateAppWidgetProviderInfo API" into pi-dev am...
Android Build Merger (Role) [Tue, 20 Mar 2018 21:39:33 +0000 (21:39 +0000)]
Merge "Merge "Updating javadoc for updateAppWidgetProviderInfo API" into pi-dev am: 90df705a0b" into pi-dev-plus-aosp

6 years agoMerge "Updating javadoc for updateAppWidgetProviderInfo API" into pi-dev
Sunny Goyal [Tue, 20 Mar 2018 21:39:03 +0000 (21:39 +0000)]
Merge "Updating javadoc for updateAppWidgetProviderInfo API" into pi-dev
am: 90df705a0b

Change-Id: I853654b3750fcc97c245daf5fa5ccf41a0e7f5ea

6 years agoMerge "Merge "Move the setActiveDevice logic from Settings to SettingsLib (1/2)"...
Android Build Merger (Role) [Tue, 20 Mar 2018 21:35:53 +0000 (21:35 +0000)]
Merge "Merge "Move the setActiveDevice logic from Settings to SettingsLib (1/2)" into pi-dev am: 6b0a9bc054" into pi-dev-plus-aosp

6 years agoMerge "Log visual interruptions to usagestats." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 21:34:01 +0000 (21:34 +0000)]
Merge "Log visual interruptions to usagestats." into pi-dev

6 years agoMerge "Move the setActiveDevice logic from Settings to SettingsLib (1/2)" into pi-dev
Hansong Zhang [Tue, 20 Mar 2018 21:33:32 +0000 (21:33 +0000)]
Merge "Move the setActiveDevice logic from Settings to SettingsLib (1/2)" into pi-dev
am: 6b0a9bc054

Change-Id: Iec4fdc5000471ecb9ba0dc44659a419c548464a2

6 years agoMerge "Make SYSTEM_INTERACTION a SystemApi" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 21:31:58 +0000 (21:31 +0000)]
Merge "Make SYSTEM_INTERACTION a SystemApi" into pi-dev

6 years agoMerge "Merge "Revert "TelephonyManager System APIs process"" into pi-dev am: cfa85917...
Android Build Merger (Role) [Tue, 20 Mar 2018 21:29:43 +0000 (21:29 +0000)]
Merge "Merge "Revert "TelephonyManager System APIs process"" into pi-dev am: cfa8591779" into pi-dev-plus-aosp

6 years agoMerge "Revert "TelephonyManager System APIs process"" into pi-dev
Amit Mahajan [Tue, 20 Mar 2018 21:27:58 +0000 (21:27 +0000)]
Merge "Revert "TelephonyManager System APIs process"" into pi-dev
am: cfa8591779

Change-Id: I9cea061688397e4d407167f8f7b680385c5592cf

6 years agoMerge "Merge "Allow the shell to start task overlay activities." into pi-dev am:...
Android Build Merger (Role) [Tue, 20 Mar 2018 21:24:11 +0000 (21:24 +0000)]
Merge "Merge "Allow the shell to start task overlay activities." into pi-dev am: 3785417848" into pi-dev-plus-aosp

6 years agoMerge "Allow the shell to start task overlay activities." into pi-dev
Winson Chung [Tue, 20 Mar 2018 21:23:45 +0000 (21:23 +0000)]
Merge "Allow the shell to start task overlay activities." into pi-dev
am: 3785417848

Change-Id: I5ceb2668aa3fa6f3b1a874a84d5dfa5325fa27e1

6 years agoMerge "Merge "Close file descriptors of ProfilerInfo" am: fedc8278ea am: 50eb1bcef2...
Android Build Merger (Role) [Tue, 20 Mar 2018 21:22:16 +0000 (21:22 +0000)]
Merge "Merge "Close file descriptors of ProfilerInfo" am: fedc8278ea am: 50eb1bcef2  -s ours" into pi-dev-plus-aosp

6 years agoMerge "Close file descriptors of ProfilerInfo" am: fedc8278ea
Madiyar Aitbayev [Tue, 20 Mar 2018 21:21:46 +0000 (21:21 +0000)]
Merge "Close file descriptors of ProfilerInfo" am: fedc8278ea
am: 50eb1bcef2  -s ours

Change-Id: Ic1ddc61c27482af47003338aafb93dc1ce0d5661

6 years agoMerge "Fixed Save logic so it's not triggered when field was not autofilled." into...
TreeHugger Robot [Tue, 20 Mar 2018 21:20:52 +0000 (21:20 +0000)]
Merge "Fixed Save logic so it's not triggered when field was not autofilled." into pi-dev

6 years agoMerge "Dispatch global settings changes to all users." into pi-dev
Svet Ganov [Tue, 20 Mar 2018 21:19:49 +0000 (21:19 +0000)]
Merge "Dispatch global settings changes to all users." into pi-dev
am: 4a99e98b48

Change-Id: Icb07bd1eba4b9ff559e5cf66a94382d24d057501

6 years agoMerge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" into pi-dev
Brad Ebinger [Tue, 20 Mar 2018 21:16:31 +0000 (21:16 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" into pi-dev

6 years agoMerge "Minor changes to the API to align the choice of password hashing algorithm...
TreeHugger Robot [Tue, 20 Mar 2018 21:13:26 +0000 (21:13 +0000)]
Merge "Minor changes to the API to align the choice of password hashing algorithm" into pi-dev

6 years agoMerge "Update lockdown icon color" into pi-dev
Chad Brubaker [Tue, 20 Mar 2018 21:11:11 +0000 (21:11 +0000)]
Merge "Update lockdown icon color" into pi-dev

6 years agoMerge "Don't throw exception for duplicate stop" into pi-dev
Andrii Kulian [Tue, 20 Mar 2018 21:11:09 +0000 (21:11 +0000)]
Merge "Don't throw exception for duplicate stop" into pi-dev

6 years agoMerge "Fix default permission granting for system TextClassifier." into pi-dev
Ye Wen [Tue, 20 Mar 2018 21:09:26 +0000 (21:09 +0000)]
Merge "Fix default permission granting for system TextClassifier." into pi-dev

6 years agoMerge "Close file descriptors of ProfilerInfo"
Madiyar Aitbayev [Tue, 20 Mar 2018 21:01:47 +0000 (21:01 +0000)]
Merge "Close file descriptors of ProfilerInfo"
am: fedc8278ea

Change-Id: I14cb671fad07b3115c2d5237fc9aff0e3c94a349

6 years agoMerge "Remove unused string." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 21:01:11 +0000 (21:01 +0000)]
Merge "Remove unused string." into pi-dev

6 years agoMerge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort...
Xi Han [Tue, 20 Mar 2018 20:49:13 +0000 (20:49 +0000)]
Merge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity." into pi-dev

6 years agoMerge "Moves the settings changed logging for statsd." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 20:30:31 +0000 (20:30 +0000)]
Merge "Moves the settings changed logging for statsd." into pi-dev

6 years agoMerge "Set Hearing Aid volume after connection" into pi-dev
Jakub Pawlowski [Tue, 20 Mar 2018 20:29:35 +0000 (20:29 +0000)]
Merge "Set Hearing Aid volume after connection" into pi-dev
am: 70cc54bd91

Change-Id: Id16dd7f5f8788ba615bb17b95e3883813ec43219

6 years agoMerge "Update work notifivation settings on upgrade." into pi-dev
Pavel Grafov [Tue, 20 Mar 2018 20:23:47 +0000 (20:23 +0000)]
Merge "Update work notifivation settings on upgrade." into pi-dev
am: 62931a44e5

Change-Id: Ic7d61a56b299ba7c722c10345f008b8ba4785182

6 years agoMerge "Expose if running a11y service has crashed" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 20:16:08 +0000 (20:16 +0000)]
Merge "Expose if running a11y service has crashed" into pi-dev

6 years agoMerge "Cleaning up notification proto." into pi-dev
Kweku Adams [Tue, 20 Mar 2018 20:12:27 +0000 (20:12 +0000)]
Merge "Cleaning up notification proto." into pi-dev
am: c1812aa644

Change-Id: I3d42d18bd9b6a2cea20a084083c327ee6372fbaa

6 years agoMerge "Handle PDFium API change" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 20:07:11 +0000 (20:07 +0000)]
Merge "Handle PDFium API change" into pi-dev

6 years agoMerge "Updating javadoc for updateAppWidgetProviderInfo API" into pi-dev
Sunny Goyal [Tue, 20 Mar 2018 20:03:47 +0000 (20:03 +0000)]
Merge "Updating javadoc for updateAppWidgetProviderInfo API" into pi-dev

6 years agoMerge "Move the setActiveDevice logic from Settings to SettingsLib (1/2)" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 19:56:51 +0000 (19:56 +0000)]
Merge "Move the setActiveDevice logic from Settings to SettingsLib (1/2)" into pi-dev

6 years ago[DO NOT MERGE] Eliminate duplicate layers in A11yService#getWindows()
Eugene Susla [Fri, 16 Mar 2018 21:35:31 +0000 (14:35 -0700)]
[DO NOT MERGE] Eliminate duplicate layers in A11yService#getWindows()

Fixes: 73904014
Test: using TestBack, ensure the attached bug is fixed
Change-Id: I097ca47563420d658cea083a3b6f8d5e7d02991c
(cherry picked from commit 8f0124190ac0386a9429724b5fdf8f491b8cad05)

6 years ago[DO NOT MERGE] Magnify status bar
Eugene Susla [Tue, 13 Mar 2018 19:24:50 +0000 (12:24 -0700)]
[DO NOT MERGE] Magnify status bar

This regressed with the recent z-ordering wm refactoring
Changing it back to old behabvior

Fixes: 74463331
Test: ensure attached bug is fixed
Change-Id: I7938a4b32a237e2fdf2e9f7bb64bab17366cb174
(cherry picked from commit 9552b26ad73bf8b2a4d4caf185ebbf94e638add3)

6 years agoMerge "Revert "TelephonyManager System APIs process"" into pi-dev
Amit Mahajan [Tue, 20 Mar 2018 19:27:10 +0000 (19:27 +0000)]
Merge "Revert "TelephonyManager System APIs process"" into pi-dev

6 years agoMerge "Adding a empty constructor so that the class can be emulated" into pi-dev
Sunny Goyal [Tue, 20 Mar 2018 19:25:11 +0000 (19:25 +0000)]
Merge "Adding a empty constructor so that the class can be emulated" into pi-dev
am: eb37b9cbb0

Change-Id: Ie57d367c4cd03d1122ac0120e6dc56658818664d

6 years agoMerge "Remove BLE App entry from mBleApps list when App died"
Treehugger Robot [Tue, 20 Mar 2018 19:20:12 +0000 (19:20 +0000)]
Merge "Remove BLE App entry from mBleApps list when App died"

6 years agoLog visual interruptions to usagestats.
Julia Reynolds [Wed, 7 Mar 2018 17:12:09 +0000 (12:12 -0500)]
Log visual interruptions to usagestats.

Test: runtest systemui-notification, cts
Bug: 74318867
Change-Id: I6233240c2a7940225cadde0258b5d7ba88b86aaf

6 years agoMerge "Allow the shell to start task overlay activities." into pi-dev
Winson Chung [Tue, 20 Mar 2018 19:06:26 +0000 (19:06 +0000)]
Merge "Allow the shell to start task overlay activities." into pi-dev

6 years agoMerge changes I09f58bdc,Iaf6cee33 into pi-dev
Lucas Dupin [Tue, 20 Mar 2018 19:05:51 +0000 (19:05 +0000)]
Merge changes I09f58bdc,Iaf6cee33 into pi-dev
am: b5438ce105

Change-Id: I0e90c930d11e7909d8a519b5714dd2ef3fa6e338

6 years agoRemove unused string.
Amin Shaikh [Mon, 19 Mar 2018 18:59:18 +0000 (14:59 -0400)]
Remove unused string.

Bug: 74486080
Test: make
Change-Id: Ibe21b9b5c8c9a19b6bd3b73faa65f572159347d0

6 years agoMerge "Dispatch global settings changes to all users." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 18:56:27 +0000 (18:56 +0000)]
Merge "Dispatch global settings changes to all users." into pi-dev

6 years agoMerge "Set Hearing Aid volume after connection" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 18:54:46 +0000 (18:54 +0000)]
Merge "Set Hearing Aid volume after connection" into pi-dev

6 years agoMerge "support framework logging for slices" into pi-dev
Chris Wren [Tue, 20 Mar 2018 18:48:06 +0000 (18:48 +0000)]
Merge "support framework logging for slices" into pi-dev
am: 6446ed4a0f

Change-Id: Ie848304de218b16ce740b0dfd5701e120c322e36

6 years agoMerge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps."
Jeff Davidson [Tue, 20 Mar 2018 18:47:34 +0000 (18:47 +0000)]
Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps."

6 years agoMerge "Update work notifivation settings on upgrade." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 18:41:13 +0000 (18:41 +0000)]
Merge "Update work notifivation settings on upgrade." into pi-dev

6 years agoMerge "DO NOT MERGE Add scan background mode to Settings.Global." into pi-dev
Anthony Stange [Tue, 20 Mar 2018 18:38:22 +0000 (18:38 +0000)]
Merge "DO NOT MERGE Add scan background mode to Settings.Global." into pi-dev
am: e1671a5c74

Change-Id: Ibf8a460244ade8b7a8b9e8a5998ca6bcf7852569

6 years agoMerge "Add support for auth-only transforms"
Treehugger Robot [Tue, 20 Mar 2018 18:36:04 +0000 (18:36 +0000)]
Merge "Add support for auth-only transforms"

6 years agoMerge "Cleaning up notification proto." into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 18:32:41 +0000 (18:32 +0000)]
Merge "Cleaning up notification proto." into pi-dev

6 years agoMerge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" into pi-dev
Ruchi Kandoi [Tue, 20 Mar 2018 18:26:41 +0000 (18:26 +0000)]
Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" into pi-dev
am: c6d6f55ec4

Change-Id: Iec6d8497086837d14f13d172c09112f0c11a7732

6 years agoMerge "Add a null check in case the display is missing." into pi-dev
Garfield Tan [Tue, 20 Mar 2018 18:18:03 +0000 (18:18 +0000)]
Merge "Add a null check in case the display is missing." into pi-dev
am: 7a4a359912

Change-Id: I00d1d5724ea374fd84a52bce8ebd4461e2b5f639

6 years agoMerge "Adding a empty constructor so that the class can be emulated" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 18:17:15 +0000 (18:17 +0000)]
Merge "Adding a empty constructor so that the class can be emulated" into pi-dev

6 years agoMerge changes I09f58bdc,Iaf6cee33 into pi-dev
Lucas Dupin [Tue, 20 Mar 2018 18:16:02 +0000 (18:16 +0000)]
Merge changes I09f58bdc,Iaf6cee33 into pi-dev

* changes:
  Hide SHOW_WHEN_LOCKED activity under scrim
  Temporarily show wallpaper when pulsing

6 years agoMerge "Close file descriptors of ProfilerInfo"
Madiyar Aitbayev [Tue, 20 Mar 2018 18:14:42 +0000 (18:14 +0000)]
Merge "Close file descriptors of ProfilerInfo"

6 years agoMerge "Revert "Revert "Break down jank between frame drops vs. triple buffered""...
John Reck [Tue, 20 Mar 2018 18:10:46 +0000 (18:10 +0000)]
Merge "Revert "Revert "Break down jank between frame drops vs. triple buffered""" into pi-dev
am: 3014a7a8c1

Change-Id: I1d0caa552f82f4c8a50c25e35ef32257ce63892c

6 years agoMerge "Remove unused ScanSettings and WifiChannel classes" into pi-dev
Oscar Shu [Tue, 20 Mar 2018 18:01:35 +0000 (18:01 +0000)]
Merge "Remove unused ScanSettings and WifiChannel classes" into pi-dev
am: c275307166

Change-Id: I20d056cc0f0343c2d2ea7f451f84e4ec6811394b

6 years agoMerge "Add uid field annotation in atoms.proto and statd memory usage optimization...
Yao Chen [Tue, 20 Mar 2018 17:54:09 +0000 (17:54 +0000)]
Merge "Add uid field annotation in atoms.proto and statd memory usage optimization." into pi-dev
am: aed0fed078

Change-Id: Ice410d3fc7b9e3c8fb410e2ae024956f5ee4821d

6 years agoAdd @Nullable annotations to getOperatorAlphaLong and
Cassie [Tue, 20 Mar 2018 17:15:50 +0000 (10:15 -0700)]
Add @Nullable annotations to getOperatorAlphaLong and
getOperatorAlphaShort to CellIdentity.

Bug: 75984192
Test: Unit test
Change-Id: I71feb20075559c7b28d4aa346a603f0d11ca69da

6 years agoMerge "Auto zen rules reset for some upgrading users" into pi-dev
Beverly [Tue, 20 Mar 2018 17:46:45 +0000 (17:46 +0000)]
Merge "Auto zen rules reset for some upgrading users" into pi-dev
am: 8cf1ae4928

Change-Id: If3eb40380db37bd1763ad649cd52a3cef271e6da

6 years agoRemove BLE App entry from mBleApps list when App died
Stanley Tng [Mon, 19 Mar 2018 20:06:45 +0000 (13:06 -0700)]
Remove BLE App entry from mBleApps list when App died

When a registered BLE App unexpectedly dies, its entry in mBleApps
list needs to be cleanup/removed.

Test: Manual test by repeatedly killing the gms core process.
Bug: 74076974
Change-Id: I2dc86b782dd6b07017a360a0b709504f0a375969

6 years agoMerge "support framework logging for slices" into pi-dev
Chris Wren [Tue, 20 Mar 2018 17:33:40 +0000 (17:33 +0000)]
Merge "support framework logging for slices" into pi-dev

6 years agoMerge "DO NOT MERGE Add scan background mode to Settings.Global." into pi-dev
Anthony Stange [Tue, 20 Mar 2018 17:29:42 +0000 (17:29 +0000)]
Merge "DO NOT MERGE Add scan background mode to Settings.Global." into pi-dev

6 years agoMerge "Scale up in ImageDecoder based on API level" into pi-dev
Leon Scroggins [Tue, 20 Mar 2018 17:29:19 +0000 (17:29 +0000)]
Merge "Scale up in ImageDecoder based on API level" into pi-dev
am: 83ad4e53b6

Change-Id: Id6aad52ccb869d3b04d5b687d9bb93c6e4aa80f0

6 years agoMerge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" into pi-dev
TreeHugger Robot [Tue, 20 Mar 2018 17:23:59 +0000 (17:23 +0000)]
Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" into pi-dev

6 years agoMerge "Add a null check in case the display is missing." into pi-dev
Garfield Tan [Tue, 20 Mar 2018 17:20:05 +0000 (17:20 +0000)]
Merge "Add a null check in case the display is missing." into pi-dev

6 years agoMerge "Revert "Revert "Break down jank between frame drops vs. triple buffered""...
TreeHugger Robot [Tue, 20 Mar 2018 17:19:56 +0000 (17:19 +0000)]
Merge "Revert "Revert "Break down jank between frame drops vs. triple buffered""" into pi-dev

6 years agoFix cutoff g in "Restarting"/"Shutting down" messages.
Alison Cichowlas [Tue, 20 Mar 2018 17:17:17 +0000 (13:17 -0400)]
Fix cutoff g in "Restarting"/"Shutting down" messages.

Bug: 68792536
Test: Manually, with font size and display size dialed to 11.
Change-Id: I00e5ea16f3d396c54cb61574e6a8f4da4ab601e2

6 years agoMerge "Remove unused ScanSettings and WifiChannel classes" into pi-dev
Oscar Shu [Tue, 20 Mar 2018 17:16:27 +0000 (17:16 +0000)]
Merge "Remove unused ScanSettings and WifiChannel classes" into pi-dev