git.osdn.net Git - android-x86/frameworks-base.git/log

Chad Brubaker [Wed, 21 Mar 2018 01:46:16 +0000 (01:46 +0000)]

Merge "Update lockdown icon color" into pi-dev am: e248eeebc2
am: c73cfdee00

Change-Id: I6625d1dae33c43dbb4479d4fa3dcba5dfd3d149f

commit | commitdiff | tree

Andrii Kulian [Wed, 21 Mar 2018 01:42:47 +0000 (01:42 +0000)]

Merge "Don't throw exception for duplicate stop" into pi-dev am: 002e0ef06e
am: e5c818e202

Change-Id: I120c11a280a34e45cc5a1895dbc7a58ee96af6a3

commit | commitdiff | tree

Stanley Tng [Wed, 21 Mar 2018 01:40:03 +0000 (01:40 +0000)]

Merge "Remove BLE App entry from mBleApps list when App died" am: 1a99d557e1 am: 20dcf997ba
am: f06e1ab68d

Change-Id: Idd3f1666a49f83e5512efca3cde4586ae3a63c82

commit | commitdiff | tree

Jeff Davidson [Wed, 21 Mar 2018 00:42:21 +0000 (00:42 +0000)]

Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." am: 88826dceef am: 572fecfc81 -s ours
am: 167aa91239 -s ours

Change-Id: Iaffc768aea8f70003958ab9512da8263ec64484d

commit | commitdiff | tree

Benedict Wong [Wed, 21 Mar 2018 00:37:12 +0000 (00:37 +0000)]

Merge "Add support for auth-only transforms" am: 275749c0b2 am: 51ca645608
am: 6690b03c20

Change-Id: Ie48a67b818954fbf19de395a1c1cdcc3f3f6809d

commit | commitdiff | tree

Ye Wen [Wed, 21 Mar 2018 00:28:50 +0000 (00:28 +0000)]

Merge "Fix default permission granting for system TextClassifier." into pi-dev am: 07b7913124
am: ec43d2d64a

Change-Id: If9ba3fd613e81a906d2d6b83e8b603c12dc5df25

commit | commitdiff | tree

Amin Shaikh [Wed, 21 Mar 2018 00:24:21 +0000 (00:24 +0000)]

Merge "Remove unused string." into pi-dev am: 20b7c174c2
am: 8932ba5807

Change-Id: Iae7247435ef9752b1aac549bb6292a3a550c0cd3

commit | commitdiff | tree

Xi Han [Wed, 21 Mar 2018 00:13:02 +0000 (00:13 +0000)]

Merge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity." into pi-dev am: cd6bb7242c
am: 987eb171b4

Change-Id: Ic8dc036e7eb287fe327e5dd65524e742e7e3cd6b

commit | commitdiff | tree

David Chen [Wed, 21 Mar 2018 00:10:15 +0000 (00:10 +0000)]

Merge "Moves the settings changed logging for statsd." into pi-dev am: 039deb4390
am: 77d986a5d9

Change-Id: I50d482a8d17804a0c75f18b5d9bc11d0633545b4

commit | commitdiff | tree

Phil Weaver [Wed, 21 Mar 2018 00:05:23 +0000 (00:05 +0000)]

Merge "Expose if running a11y service has crashed" into pi-dev am: c863d506cf
am: 7bd31d90e1

Change-Id: I70ac2da5afffaa0721472242c52744f9d525a452

commit | commitdiff | tree

Philip P. Moltmann [Tue, 20 Mar 2018 23:39:03 +0000 (23:39 +0000)]

Merge "Handle PDFium API change" into pi-dev am: 173d0e9b34
am: 9449d80441

Change-Id: I8ce1328234178baa790cf9c56526afe43fdf2af8

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Mar 2018 23:32:26 +0000 (23:32 +0000)]

Merge "Merge "Updating javadoc for updateAppWidgetProviderInfo API" into pi-dev am: 90df705a0b" into pi-dev-plus-aosp
am: 0cce7953fa

Change-Id: I52074723aec39b5fcc40617687e6cb98091e9b4b

commit | commitdiff | tree

Hansong Zhang [Tue, 20 Mar 2018 23:21:53 +0000 (23:21 +0000)]

Merge "Merge "Move the setActiveDevice logic from Settings to SettingsLib (1/2)" into pi-dev am: 6b0a9bc054" into pi-dev-plus-aosp
am: d4f6ba3f4f

Change-Id: Iba86e60520c1b4a3649d4a5a672f661de5b3163a

commit | commitdiff | tree

Amit Mahajan [Tue, 20 Mar 2018 23:12:35 +0000 (23:12 +0000)]

Merge "Merge "Revert "TelephonyManager System APIs process"" into pi-dev am: cfa8591779" into pi-dev-plus-aosp
am: 824d942083 -s ours

Change-Id: I52356e8e2ce9efc911d4c2d00658f13afd662a4f

commit | commitdiff | tree

Winson Chung [Tue, 20 Mar 2018 23:08:32 +0000 (23:08 +0000)]

Merge "Merge "Allow the shell to start task overlay activities." into pi-dev am: 3785417848" into pi-dev-plus-aosp
am: 6e377c93c8

Change-Id: Id63ed878fece5499e264c6fae17e638f636e9a40

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Madiyar Aitbayev [Tue, 20 Mar 2018 22:45:51 +0000 (22:45 +0000)]

Merge "Merge "Close file descriptors of ProfilerInfo" am: fedc8278ea am: 50eb1bcef2 -s ours" into pi-dev-plus-aosp
am: 0b99c2e33e -s ours

Change-Id: I351f859ad8360dc0ce3aefe3bb8464ebd35c142e

commit | commitdiff | tree

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

commit | commitdiff | tree

Svet Ganov [Tue, 20 Mar 2018 22:34:20 +0000 (22:34 +0000)]

Merge "Dispatch global settings changes to all users." into pi-dev am: 4a99e98b48
am: ce0f7f59b7

Change-Id: I1e4c12e90d7457c564ba0a453460e0bc6887db2b

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Tue, 20 Mar 2018 22:27:51 +0000 (22:27 +0000)]

Merge "Set Hearing Aid volume after connection" into pi-dev am: 70cc54bd91
am: c541ff07c3

Change-Id: Ic428c8629d09ed953acc95239d1bae396050f24c

commit | commitdiff | tree

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

commit | commitdiff | tree

Pavel Grafov [Tue, 20 Mar 2018 22:14:54 +0000 (22:14 +0000)]

Merge "Update work notifivation settings on upgrade." into pi-dev am: 62931a44e5
am: e205bc2e54

Change-Id: Iff40426c8c7f62bab9a1ca4470b63dd1e00574c3

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kweku Adams [Tue, 20 Mar 2018 21:53:00 +0000 (21:53 +0000)]

Merge "Cleaning up notification proto." into pi-dev am: c1812aa644
am: 15f910f11c

Change-Id: I20300ec3dfc4009c9a022b9fb742d6f0d1057db5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Mar 2018 21:46:48 +0000 (21:46 +0000)]

Merge "Adding a empty constructor so that the class can be emulated" into pi-dev am: eb37b9cbb0
am: b1d8f2bf06

Change-Id: Ib29f7b6020508368a555b82046776c79fca78818

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lucas Dupin [Tue, 20 Mar 2018 21:16:59 +0000 (21:16 +0000)]

Merge changes I09f58bdc,Iaf6cee33 into pi-dev am: b5438ce105
am: 7ee7406915

Change-Id: Id697f434d8b70c929e0390a48e360a5d10dc3e9e

commit | commitdiff | tree

Chad Brubaker [Tue, 20 Mar 2018 21:11:11 +0000 (21:11 +0000)]

Merge "Update lockdown icon color" into pi-dev

commit | commitdiff | tree

Andrii Kulian [Tue, 20 Mar 2018 21:11:09 +0000 (21:11 +0000)]

Merge "Don't throw exception for duplicate stop" into pi-dev

commit | commitdiff | tree

Ye Wen [Tue, 20 Mar 2018 21:09:26 +0000 (21:09 +0000)]

Merge "Fix default permission granting for system TextClassifier." into pi-dev

commit | commitdiff | tree

Madiyar Aitbayev [Tue, 20 Mar 2018 21:01:47 +0000 (21:01 +0000)]

Merge "Close file descriptors of ProfilerInfo"
am: fedc8278ea

Change-Id: I14cb671fad07b3115c2d5237fc9aff0e3c94a349

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 21:01:11 +0000 (21:01 +0000)]

Merge "Remove unused string." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 20:30:31 +0000 (20:30 +0000)]

Merge "Moves the settings changed logging for statsd." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

David Brazdil [Tue, 20 Mar 2018 20:26:45 +0000 (20:26 +0000)]

Merge "Revert "More flexible API enforcement policy.""

commit | commitdiff | tree

Chris Wren [Tue, 20 Mar 2018 20:24:18 +0000 (20:24 +0000)]

Merge "support framework logging for slices" into pi-dev am: 6446ed4a0f
am: d1d1980455

Change-Id: I605878dc019570390d28e4795d02cc3cc3d6ffa8

commit | commitdiff | tree

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

commit | commitdiff | tree

David Brazdil [Tue, 20 Mar 2018 20:20:44 +0000 (20:20 +0000)]

Revert "More flexible API enforcement policy."

This reverts commit 8bf10c74d47a5d154c05b1c7f4068c69a8f3cbc7.

Reason for revert: Breaks run-test 674-hiddenapi

Change-Id: I014b29bf502d98d3e4134c16302008de085f64e2

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 20:16:08 +0000 (20:16 +0000)]

Merge "Expose if running a11y service has crashed" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 20:07:11 +0000 (20:07 +0000)]

Merge "Handle PDFium API change" into pi-dev

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Mar 2018 20:03:47 +0000 (20:03 +0000)]

Merge "Updating javadoc for updateAppWidgetProviderInfo API" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Paul Mclean [Tue, 20 Mar 2018 19:43:14 +0000 (19:43 +0000)]

Merge "(re)integrating Native MIDI API into NDK - base API"

commit | commitdiff | tree

Eugene Susla [Tue, 20 Mar 2018 19:39:31 +0000 (19:39 +0000)]

Merge "Make TCMS multi-user-aware"

commit | commitdiff | tree

Amit Mahajan [Tue, 20 Mar 2018 19:27:10 +0000 (19:27 +0000)]

Merge "Revert "TelephonyManager System APIs process"" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 19:25:14 +0000 (19:25 +0000)]

Merge "Revert "TelephonyManager System APIs process""

commit | commitdiff | tree

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

commit | commitdiff | tree

Anthony Stange [Tue, 20 Mar 2018 19:23:18 +0000 (19:23 +0000)]

Merge "DO NOT MERGE Add scan background mode to Settings.Global." into pi-dev am: e1671a5c74
am: 59af29551c -s ours

Change-Id: I56e151bcbbd99afbce70738c42734eec2562115a

commit | commitdiff | tree

Treehugger Robot [Tue, 20 Mar 2018 19:20:12 +0000 (19:20 +0000)]

Merge "Remove BLE App entry from mBleApps list when App died"

commit | commitdiff | tree

Ruchi Kandoi [Tue, 20 Mar 2018 19:19:25 +0000 (19:19 +0000)]

Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" into pi-dev am: c6d6f55ec4
am: 4f5c0cd6f4

Change-Id: Ie7967bfd9c52df36ef2dc7ff6ee64890b8fd5abe

commit | commitdiff | tree

Garfield Tan [Tue, 20 Mar 2018 19:12:27 +0000 (19:12 +0000)]

Merge "Add a null check in case the display is missing." into pi-dev am: 7a4a359912
am: 61fb639a7e

Change-Id: I7c9dcc4727acfbceffe6f4c72dcc44bf30bcdc1b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Amin Shaikh [Mon, 19 Mar 2018 18:59:18 +0000 (14:59 -0400)]

Remove unused string.

Bug: 74486080
Test: make
Change-Id: Ibe21b9b5c8c9a19b6bd3b73faa65f572159347d0

commit | commitdiff | tree

John Reck [Tue, 20 Mar 2018 19:03:27 +0000 (19:03 +0000)]

Merge "Revert "Revert "Break down jank between frame drops vs. triple buffered""" into pi-dev am: 3014a7a8c1
am: d1000e5879

Change-Id: If3340864c6467f74ebb7aa66d3a47ae004d5821b

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 18:56:27 +0000 (18:56 +0000)]

Merge "Dispatch global settings changes to all users." into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 18:54:46 +0000 (18:54 +0000)]

Merge "Set Hearing Aid volume after connection" into pi-dev

commit | commitdiff | tree

Oscar Shu [Tue, 20 Mar 2018 18:50:42 +0000 (18:50 +0000)]

Merge "Remove unused ScanSettings and WifiChannel classes" into pi-dev am: c275307166
am: 8bd8e03ca7

Change-Id: Ie21f03cfd854dad4dc455348cec0993309982a3d

commit | commitdiff | tree

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

commit | commitdiff | tree

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."

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 18:41:13 +0000 (18:41 +0000)]

Merge "Update work notifivation settings on upgrade." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 20 Mar 2018 18:36:04 +0000 (18:36 +0000)]

Merge "Add support for auth-only transforms"

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 18:33:09 +0000 (18:33 +0000)]

Merge "Update skia framework to use new MakeFromTexture calls"

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 18:32:41 +0000 (18:32 +0000)]

Merge "Cleaning up notification proto." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Mar 2018 18:21:43 +0000 (18:21 +0000)]

Merge "More flexible API enforcement policy."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Madiyar Aitbayev [Tue, 20 Mar 2018 18:14:42 +0000 (18:14 +0000)]

Merge "Close file descriptors of ProfilerInfo"

commit | commitdiff | tree

Yao Chen [Tue, 20 Mar 2018 18:12:24 +0000 (18:12 +0000)]

Merge "Add uid field annotation in atoms.proto and statd memory usage optimization." into pi-dev am: aed0fed078
am: 38063f33f3

Change-Id: I9e5893b7d50fbffd9524991fffcb7498a9dbea7b

commit | commitdiff | tree

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

commit | commitdiff | tree

Beverly [Tue, 20 Mar 2018 18:05:37 +0000 (18:05 +0000)]

Merge "Auto zen rules reset for some upgrading users" into pi-dev am: 8cf1ae4928
am: 41651c75cf

Change-Id: I2a812c0d318ef5ad074d2cff4ba7217548f956e5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Leon Scroggins [Tue, 20 Mar 2018 17:51:07 +0000 (17:51 +0000)]

Merge "Scale up in ImageDecoder based on API level" into pi-dev am: 83ad4e53b6
am: 27e12ac211

Change-Id: Ie015dd5fe1ebcf66fbb347c9183062c6cd5b1714

commit | commitdiff | tree

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