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

Jiuyu Sun [Mon, 16 Apr 2018 21:20:02 +0000 (14:20 -0700)]

Merge "Fix typos." into pi-dev
am: 2135c52b4d

Change-Id: I2f700355d8f4476a875e4b95df17e7441b0332b4

Bill Yi [Mon, 16 Apr 2018 20:59:51 +0000 (13:59 -0700)]

Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am: 231719b4d2 am: 60fb81edda am: f84cc88320
am: b95650a1ba

Change-Id: If6be4a98e37745157bed0dbb5f2f25785d43d294

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:53:45 +0000 (13:53 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553 am: fde5e09eeb -s ours am: 490f12c8c1 -s ours am: 0af21ab046 -s ours
am: 46eac73f6a -s ours

Change-Id: Iad505c39d07c4fd4025518f4bafdfbd494edf935

commit | commitdiff | tree

Hall Liu [Mon, 16 Apr 2018 20:51:53 +0000 (13:51 -0700)]

[automerger skipped] Merge "Move RTT system setting to Settings.Secure" am: 9a51f07117
am: 5f0cbc215d -s ours

Change-Id: Ibbae5f7cd07e12e4b6c52f9e260dfb8562cdf930

commit | commitdiff | tree

Jiuyu Sun [Mon, 16 Apr 2018 20:48:52 +0000 (20:48 +0000)]

Merge "Fix typos." into pi-dev

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:47:20 +0000 (13:47 -0700)]

Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am: 231719b4d2 am: 60fb81edda
am: f84cc88320

Change-Id: I6cd93c965df3aa652a1b669df2a88acd3a6c4e24

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:43:42 +0000 (13:43 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054 am: bfcb8b99a5 -s ours am: f62419973f -s ours am: d9352518aa -s ours
am: f227dadb99 -s ours

Change-Id: Ic929b21fc7b24fe65ea8364dfd0686c383bd3b57

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:42:12 +0000 (13:42 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553 am: fde5e09eeb -s ours am: 490f12c8c1 -s ours
am: 0af21ab046 -s ours

Change-Id: If9dff24f3fff2a9916d74874e2bc682b5a037c8d

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:41:53 +0000 (13:41 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425 am: cb80417eab -s ours am: 3194fdd40a -s ours am: 923f65751a -s ours
am: 42cb72318b -s ours

Change-Id: Ic55365f484ace53aacb4dd76006d193c05591f21

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:38:59 +0000 (13:38 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288 am: 67841fe1e6 -s ours am: 97ddc81da4 -s ours am: 3b3379f16a -s ours
am: 8d9df4b042 -s ours

Change-Id: I14f58ca53b0c9e94c34d727f7f20c13a8e255843

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:35:40 +0000 (13:35 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28 am: d12aff917a -s ours am: 06e9f9dad5 -s ours am: 06ce4b2618 -s ours
am: e2d8e005b2 -s ours

Change-Id: I4c7aa83b17d5e437616c4674fda27128852503b2

commit | commitdiff | tree

Philip P. Moltmann [Mon, 16 Apr 2018 20:33:49 +0000 (13:33 -0700)]

Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e am: 6a845fe056 am: 1d9e95553b
am: 9aab64bd1c

Change-Id: Ie0c30d5ae70783f955e4a50a155f5c8c2c5f806e

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:27:02 +0000 (13:27 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054 am: bfcb8b99a5 -s ours am: f62419973f -s ours
am: d9352518aa -s ours

Change-Id: Idc313d4c705d68edb65c057dfc5eb6e8e9efa80e

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:24:55 +0000 (13:24 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425 am: cb80417eab -s ours am: 3194fdd40a -s ours
am: 923f65751a -s ours

Change-Id: I8b64a8fbbbcd92a6a949bcae98b44f37c0a4e09c

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:23:17 +0000 (13:23 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288 am: 67841fe1e6 -s ours am: 97ddc81da4 -s ours
am: 3b3379f16a -s ours

Change-Id: I24f1dae0a8fc333cd2668f1085a81c1755a37707

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 20:21:23 +0000 (13:21 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28 am: d12aff917a -s ours am: 06e9f9dad5 -s ours
am: 06ce4b2618 -s ours

Change-Id: I21bade1db7ee51f5ccbdd4afd08f3399c2e886e7

commit | commitdiff | tree

Philip P. Moltmann [Mon, 16 Apr 2018 20:19:04 +0000 (13:19 -0700)]

Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e am: 6a845fe056
am: 1d9e95553b

Change-Id: Icb9e0c7261da6147d7d70be9f243fb387799c58f

commit | commitdiff | tree

Hall Liu [Mon, 16 Apr 2018 20:08:16 +0000 (13:08 -0700)]

Merge "Move RTT system setting to Settings.Secure"
am: 9a51f07117

Change-Id: I226e9a91725f7755595c3530162829f8bf61b135

commit | commitdiff | tree

Philip P. Moltmann [Mon, 16 Apr 2018 20:06:05 +0000 (13:06 -0700)]

[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805 am: 877a845005 am: 885bcab242 am: c201aff50a -s ours
am: b7af9ee423

Change-Id: I83d588b64dd04b95658dafe9028df8bf3cd0bc19

commit | commitdiff | tree

Philip P. Moltmann [Mon, 16 Apr 2018 19:50:03 +0000 (12:50 -0700)]

[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805 am: 877a845005 am: 885bcab242
am: c201aff50a -s ours

Change-Id: Ie8b5e0cabb3abfa917653993f1010b3c5db7e5af

commit | commitdiff | tree

Ryan Mitchell [Mon, 16 Apr 2018 19:45:57 +0000 (12:45 -0700)]

Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev
am: 61ac57283f

Change-Id: Ibd7e47e33d49e6c609b9b73960186020728ac0f5

commit | commitdiff | tree

Caxton Chan [Mon, 16 Apr 2018 19:35:04 +0000 (12:35 -0700)]

Merge "Enable feature flag for audio output switcher." into pi-dev
am: 116e05cbba

Change-Id: Id7144fbbf59ca9efeee0f20aa1a988377c87747a

commit | commitdiff | tree

Ryan Mitchell [Mon, 16 Apr 2018 19:28:43 +0000 (19:28 +0000)]

Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev

commit | commitdiff | tree

Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]

Merge "Enable feature flag for audio output switcher." into pi-dev

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 19:20:42 +0000 (12:20 -0700)]

Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am: 231719b4d2
am: 60fb81edda

Change-Id: I5933e96aa34fc6aff073513bdb0400fd02796e62

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 19:16:09 +0000 (12:16 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553 am: fde5e09eeb -s ours
am: 490f12c8c1 -s ours

Change-Id: I5c1579d596c4f444ebee20cf217c3e4872182d0c

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 19:14:27 +0000 (12:14 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054 am: bfcb8b99a5 -s ours
am: f62419973f -s ours

Change-Id: I37dbec1d64219b2c2b57da0535364606b527f3f3

commit | commitdiff | tree

Philip P. Moltmann [Mon, 16 Apr 2018 19:08:05 +0000 (12:08 -0700)]

[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf am: d139755de8 am: 5e2a5a8ce1 -s ours
am: a8b12c4994

Change-Id: I2315205ef2681f5384a12e84a8274fe49d910709

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 19:01:52 +0000 (12:01 -0700)]

Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev
am: 231719b4d2

Change-Id: I5186692869d8849e0abc8d60f97970ce07e273aa

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 19:00:03 +0000 (12:00 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553
am: fde5e09eeb -s ours

Change-Id: Ife2f1cabaad48b2b89dfe46c6de4f1cfa18c27cc

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 18:58:54 +0000 (11:58 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425 am: cb80417eab -s ours
am: 3194fdd40a -s ours

Change-Id: I67f37180a53bdd87975f458ce68ae75890ebec29

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 18:56:07 +0000 (11:56 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054
am: bfcb8b99a5 -s ours

Change-Id: I9573bb5fb938d29fbd40c94bb36203607bacdfee

commit | commitdiff | tree

hughchen [Mon, 16 Apr 2018 18:55:54 +0000 (11:55 -0700)]

Merge "Add new function to get audio state" into pi-dev
am: e504e1322e

Change-Id: I776ef38002527e9a3db49896b86fe377fce01e8f

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 18:55:52 +0000 (11:55 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288 am: 67841fe1e6 -s ours
am: 97ddc81da4 -s ours

Change-Id: I0a2be41354fd01b370c95f0f77d67c878bb84d55

commit | commitdiff | tree

Philip P. Moltmann [Mon, 16 Apr 2018 18:55:42 +0000 (11:55 -0700)]

[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf am: d139755de8
am: 5e2a5a8ce1 -s ours

Change-Id: I665c1f65a60926a70627db83da5c2c6f3e4f09c8

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 18:52:51 +0000 (11:52 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425
am: cb80417eab -s ours

Change-Id: I29e67171958497655f4d0374b2decbc1429135f7

commit | commitdiff | tree

Ricky Wai [Mon, 16 Apr 2018 18:50:44 +0000 (11:50 -0700)]

Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev
am: ed2a3cadc1

Change-Id: Icb8d0962ddbe4ba4c25b835cc631cedd94c818eb

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 18:49:23 +0000 (11:49 -0700)]

[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288
am: 67841fe1e6 -s ours

Change-Id: Ic7684c0d86e85aaebfb4e459d4dbd57d0d67d3b9

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]

Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553
  [automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:53 +0000 (18:42 +0000)]

[automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054

Change-Id: I7cb9fde2607bd5cf254218df7922c552f200d425

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:48 +0000 (18:42 +0000)]

[automerger] Import translations. DO NOT MERGE am: ba2da34cdf

Change-Id: Ic48e117b51a8f0d3c2f9a45536b4f85f9100b43e

commit | commitdiff | tree

Hall Liu [Mon, 16 Apr 2018 18:40:28 +0000 (18:40 +0000)]

Merge "Move RTT system setting to Settings.Secure"

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:14 +0000 (18:39 +0000)]

[automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425

Change-Id: Id86be4edea769f62ae4dd3de5a21a6fe8471151d

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:09 +0000 (18:39 +0000)]

[automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d

Change-Id: I1a5a8473bb77a315ce84e2656e5640488ecb7881

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]

Merge "Add new function to get audio state" into pi-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 18:33:00 +0000 (18:33 +0000)]

[automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288

Change-Id: Iaf447a22df4ace00079a63066b0dcadce145443b

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 18:32:54 +0000 (18:32 +0000)]

[automerger] Import translations. DO NOT MERGE am: c7fe3a5972

Change-Id: I9ec7fb1d5c5657b8b4936303d39fbecff498eb46

commit | commitdiff | tree

Andreas Gampe [Mon, 16 Apr 2018 18:21:20 +0000 (11:21 -0700)]

Merge "Revert "Frameworks/base: Compiled-classes support"" am: 087bae3ffe
am: f6786aeb64

Change-Id: I52f22c3df2a0a8d99d7be0d68fbf11eec2de8024

commit | commitdiff | tree

Ryan Mitchell [Mon, 16 Apr 2018 18:21:14 +0000 (18:21 +0000)]

Revert "AAPT: Modified StringPool uniqueness detection"

This reverts commit 35ecb89a8aa68f24d2e991df5bb9964ad15075dc.

Reason for revert: <Long make duration (infinite loop)>

Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab

commit | commitdiff | tree

Ricky Wai [Mon, 16 Apr 2018 18:19:00 +0000 (18:19 +0000)]

Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev

commit | commitdiff | tree

Andreas Gampe [Mon, 16 Apr 2018 18:10:20 +0000 (11:10 -0700)]

Merge "Revert "Frameworks/base: Compiled-classes support""
am: 087bae3ffe

Change-Id: I32cba3d29b54827ee3d40ea022a1d9eae27cfb0f

commit | commitdiff | tree

Beverly [Mon, 16 Apr 2018 18:03:54 +0000 (11:03 -0700)]

Merge "Add logging to ScheduleConditionProvider" into pi-dev
am: 8f308fd4e3

Change-Id: I39a7d1316454c6a0050d736324d949846fdf940d

commit | commitdiff | tree

Bryce Lee [Mon, 16 Apr 2018 17:54:57 +0000 (10:54 -0700)]

Merge "Remove temporary logging." into pi-dev
am: 216b50ad97

Change-Id: I49b008a4173e0c3fee6a3e3202f5b18c1c991fc9

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 17:38:34 +0000 (17:38 +0000)]

Merge "Add logging to ScheduleConditionProvider" into pi-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 17:38:05 +0000 (17:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553

Change-Id: Ia7cd12b4e564df81716a199c23e0566a7d263e32

commit | commitdiff | tree

Bryce Lee [Mon, 16 Apr 2018 17:36:45 +0000 (17:36 +0000)]

Merge "Remove temporary logging." into pi-dev

commit | commitdiff | tree

Ryan Mitchell [Mon, 16 Apr 2018 17:32:42 +0000 (10:32 -0700)]

Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev
am: 356feb53b6

Change-Id: Ib8b9fbea279f61b5df9058d9f72dfb23f9d9dbc6

commit | commitdiff | tree

Derek Sollenberger [Mon, 16 Apr 2018 17:27:40 +0000 (10:27 -0700)]

Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev
am: 1c70ecb455

Change-Id: Ia10cec1f06051620b39869265ad386a63b5434e9

commit | commitdiff | tree

Isha Bobra [Mon, 16 Apr 2018 17:22:50 +0000 (10:22 -0700)]

The file CachedBluetoothDeviceManager.java performs synchronization at class level. This CL just adds the missing synchronization bits.
am: d467da7309

Change-Id: I0c2d1b207276aad17e369eefdf041a046a08a68a

commit | commitdiff | tree

Jeff Sharkey [Mon, 16 Apr 2018 17:19:39 +0000 (10:19 -0700)]

Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
am: f78b8ce258

Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593

commit | commitdiff | tree

Ryan Mitchell [Mon, 16 Apr 2018 17:15:53 +0000 (17:15 +0000)]

Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev

commit | commitdiff | tree

Chavi Weingarten [Mon, 16 Apr 2018 17:13:31 +0000 (10:13 -0700)]

Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev
am: 2754777d30

Change-Id: Ic662d242231c5e8c375805930e59d55da0a15b01

commit | commitdiff | tree

Jeff Sharkey [Mon, 16 Apr 2018 17:07:52 +0000 (10:07 -0700)]

Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
am: e0fe6df357

Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 17:05:45 +0000 (17:05 +0000)]

Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev

commit | commitdiff | tree

Isha Bobra [Thu, 5 Apr 2018 20:27:47 +0000 (13:27 -0700)]

The file CachedBluetoothDeviceManager.java performs synchronization
at class level. This CL just adds the missing synchronization bits.

Test: Manual
Change-Id: I71e0a194f8d126c2898a4086d6bcb62156cab9ad
Bug: 77849851

commit | commitdiff | tree

Isha Bobra [Mon, 16 Apr 2018 16:55:47 +0000 (09:55 -0700)]

Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev
am: ed344d1753

Change-Id: I9f9df695df7555ea67cf4ca371528b9246d70dff

commit | commitdiff | tree

Jeff Sharkey [Mon, 16 Apr 2018 16:54:32 +0000 (16:54 +0000)]

Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 16:50:48 +0000 (16:50 +0000)]

Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 16 Apr 2018 16:50:34 +0000 (16:50 +0000)]

Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""

This reverts commit bd2a9a2915c17cbe2100d6d2077568d0936cd719.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I596d330d64942105f447bb613012bb11e281a805
Exempt-From-Owner-Approval: keep tests passing

commit | commitdiff | tree

Jeff Sharkey [Mon, 16 Apr 2018 16:50:06 +0000 (16:50 +0000)]

Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev

commit | commitdiff | tree

Isha Bobra [Mon, 16 Apr 2018 16:42:33 +0000 (16:42 +0000)]

Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 16 Apr 2018 16:39:55 +0000 (16:39 +0000)]

Revert "OP_GET_USAGE_STATS should be noted, not checked."

This reverts commit 5a8bcd90315c24e2f16176fd13922b2a92752cd5.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing

commit | commitdiff | tree

Treehugger Robot [Mon, 16 Apr 2018 16:33:24 +0000 (16:33 +0000)]

Merge "Revert "Frameworks/base: Compiled-classes support""

commit | commitdiff | tree

Michael Wright [Mon, 16 Apr 2018 16:29:39 +0000 (09:29 -0700)]

Merge "Convert the BrightnessController to a log scale control." into pi-dev
am: 56a5620b41

Change-Id: I440109410c4cac5ebd175e05e9f12bad0de09ed4

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 16:24:28 +0000 (09:24 -0700)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 1bf77e9021 -s ours

Change-Id: Iaaa5c19a3da66e504d89a1af6d700b297a301751

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 16:18:34 +0000 (16:18 +0000)]

Merge "Convert the BrightnessController to a log scale control." into pi-dev

commit | commitdiff | tree

Adrian Roos [Mon, 16 Apr 2018 16:16:56 +0000 (09:16 -0700)]

Merge changes I478047cc,Ibe16ffd7 into pi-dev
am: 892ee93977

Change-Id: Id60ec23a210c907bf61a4f0c95441e5f48b773cc

commit | commitdiff | tree

Makoto Onuki [Mon, 16 Apr 2018 16:08:35 +0000 (09:08 -0700)]

Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev
am: 8f9fce0680

Change-Id: Ifb0325feb6c9a73a50c8ffe0f6e2b774966fa6fb

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 16:08:18 +0000 (16:08 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 16:07:27 +0000 (16:07 +0000)]

Merge changes I478047cc,Ibe16ffd7 into pi-dev

* changes:
DisplayCutout: Ensure stable insets cover top cutout
Cutout: Use stable density for inflating simulated cutouts

commit | commitdiff | tree

Makoto Onuki [Mon, 16 Apr 2018 15:55:36 +0000 (15:55 +0000)]

Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev

commit | commitdiff | tree

Makoto Onuki [Mon, 16 Apr 2018 15:51:04 +0000 (08:51 -0700)]

Merge "Fix "auto battery saver notification comes back"" into pi-dev
am: 167032ab00

Change-Id: I2f1d971f2ca72fe5b4571027182235caf15f6575

commit | commitdiff | tree

Beverly [Mon, 16 Apr 2018 15:42:40 +0000 (11:42 -0400)]

Add logging to ScheduleConditionProvider

Test: n/a
Bug: 77906756
Change-Id: Icfc0cbaf6d53315e437ac3ea3ab693b3e0703d2f

commit | commitdiff | tree

Chavi Weingarten [Mon, 16 Apr 2018 15:34:45 +0000 (15:34 +0000)]

Revert "ViewRoot: Ensure we release surface from setWindowStopped."

This reverts commit 35274cb0ce90ce4381e534d1c04c9d919eb588fc.

Reason for revert: b/78110749
Fixes: 78110749

Change-Id: Ib1b15e4f7325cb265574090b658514fc0b3c4021

commit | commitdiff | tree

Adrian Roos [Mon, 16 Apr 2018 15:32:42 +0000 (08:32 -0700)]

Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
am: 26c25f0033

Change-Id: I2e256085c93e9c5968477f715f4d0929e0e74f8f

commit | commitdiff | tree

Makoto Onuki [Mon, 16 Apr 2018 15:32:20 +0000 (15:32 +0000)]

Merge "Fix "auto battery saver notification comes back"" into pi-dev

commit | commitdiff | tree

David Brazdil [Mon, 16 Apr 2018 15:24:40 +0000 (08:24 -0700)]

Merge "Add more hidden API on light greylist" into pi-dev
am: 8ef1cb9d10

Change-Id: Ibe5037b353b01f7eb523a5a44112e429b230dff2

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 15:20:04 +0000 (15:20 +0000)]

Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev

commit | commitdiff | tree

Dan Gittik [Mon, 16 Apr 2018 15:05:23 +0000 (08:05 -0700)]

Merge "Added screen brightness override feedback." into pi-dev
am: 6ddaed5efd

Change-Id: Id73dbb9fc8286865d0bb78949f8abb585defa483

commit | commitdiff | tree

David Brazdil [Mon, 16 Apr 2018 15:04:07 +0000 (15:04 +0000)]

Merge "Add more hidden API on light greylist" into pi-dev

commit | commitdiff | tree

Benjamin Miller [Mon, 16 Apr 2018 15:01:15 +0000 (08:01 -0700)]

Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev
am: bdf8f1e3a2

Change-Id: I78270fc1f639f87c3a26ab97ec526c902ff081c7

commit | commitdiff | tree

Adrian Roos [Mon, 16 Apr 2018 14:56:07 +0000 (16:56 +0200)]

DisplayCutout: Ensure stable insets cover top cutout

Fixes an issue where the stable insets could become smaller
than the top cutout if the display density was set lower
than the natural density.

Bug: 78110564
Test: Set display size to "small", turn on cutout, verify apps do not have a gap between status bar and content.
Change-Id: I478047ccaade0e4e265cc57d03b072ae578b49d0

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 14:48:38 +0000 (14:48 +0000)]

Merge "Added screen brightness override feedback." into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 14:48:19 +0000 (14:48 +0000)]

Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 14:34:28 +0000 (07:34 -0700)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 3c074aacc2 -s ours

Change-Id: Ibc2f88f11d3ae8add29a60af099efc6818125662

commit | commitdiff | tree

Bill Yi [Mon, 16 Apr 2018 14:32:24 +0000 (07:32 -0700)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 1caec875ab -s ours

Change-Id: Ic6152a928385bfc4c32bc41aa2542266d58eb0ec

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 14:26:28 +0000 (14:26 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Apr 2018 14:22:12 +0000 (14:22 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

Adrian Roos [Mon, 16 Apr 2018 14:12:40 +0000 (16:12 +0200)]

Cutout: Use stable density for inflating simulated cutouts

Change-Id: Ibe16ffd792040e753d54d7085ba74e8880de111e
Fixes: 77961334
Test: Set density to Very large, enable simulated cutout, verify it still looks reasonable.

commit | commitdiff | tree

Adrian Roos [Mon, 16 Apr 2018 14:03:04 +0000 (16:03 +0200)]

Cutout: Fix broken cutout rendering in landscape

Change-Id: I835fd7fa06dfcc0eff0323efe8f2913b9e1239b8
Fixes: 77960411
Test: Simulate cutout, rotate to landscape, verify cutout is still visible.