OSDN Git Service
Android Build Merger (Role) [Mon, 16 Apr 2018 21:01:37 +0000 (21:01 +0000)]
Merge "[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 am:
c9e2827ae5 -s ours"
Bill Yi [Mon, 16 Apr 2018 21:01:17 +0000 (14:01 -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
am:
c9e2827ae5 -s ours
Change-Id: I86943f25f24bf7eaa6b41344c471846cb49ae3c3
Ryan Mitchell [Mon, 16 Apr 2018 21:00:40 +0000 (21:00 +0000)]
Merge "Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev am:
61ac57283f am:
312a3ff350"
Bill Yi [Mon, 16 Apr 2018 20:59:25 +0000 (13:59 -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
am:
e6013c722f -s ours
Change-Id: I88dea59588366dea65ce3f70d4c2da3d4bfcd4b9
Bill Yi [Mon, 16 Apr 2018 20:57:26 +0000 (13:57 -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
am:
f9878160f3 -s ours
Change-Id: Id347203d030d71b3d20300ff38296cf2780691c3
Philip P. Moltmann [Mon, 16 Apr 2018 20:55:47 +0000 (13:55 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am:
6173fbe12e am:
6a845fe056 am:
1d9e95553b am:
9aab64bd1c
am:
e67610b466
Change-Id: Icb2c42f5fe50580cfc10c6fe734603e6d5bbe6f7
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
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
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
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
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
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
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
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
Philip P. Moltmann [Mon, 16 Apr 2018 20:14:31 +0000 (13:14 -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
am:
b3a15333b9 -s ours
Change-Id: If4c405e5c04eb3f611c24a2869bb91d4a9eaa51f
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
Ryan Mitchell [Mon, 16 Apr 2018 20:02:15 +0000 (13:02 -0700)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev am:
61ac57283f
am:
312a3ff350
Change-Id: I956eefccec0613ed3b6caf0ec665c8079b6a41bf
Ryan Mitchell [Mon, 16 Apr 2018 19:58:27 +0000 (12:58 -0700)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev am:
61ac57283f
am:
312a3ff350
Change-Id: I9bebc14cf22de6a854c63a1354e9949f42348af4
Caxton Chan [Mon, 16 Apr 2018 19:50:14 +0000 (12:50 -0700)]
Merge "Enable feature flag for audio output switcher." into pi-dev am:
116e05cbba
am:
fc01e133b5
Change-Id: I512891cb258131cd1b6174e60936f707f6a875a6
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
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
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
Ryan Mitchell [Mon, 16 Apr 2018 19:28:43 +0000 (19:28 +0000)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev
Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]
Merge "Enable feature flag for audio output switcher." into pi-dev
Philip P. Moltmann [Mon, 16 Apr 2018 19:20:22 +0000 (12:20 -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
am:
883ad332eb -s ours
Change-Id: I8ac68b452633a3cfb3992ab53b5cc0e374f04d2f
hughchen [Mon, 16 Apr 2018 19:11:57 +0000 (12:11 -0700)]
Merge "Add new function to get audio state" into pi-dev am:
e504e1322e
am:
bfdd51a466
Change-Id: I694b0f6143bd37a69f7223d53d7441f85a03b335
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
Ricky Wai [Mon, 16 Apr 2018 19:07:05 +0000 (12:07 -0700)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev am:
ed2a3cadc1
am:
8798ae731c
Change-Id: I0136e13cab068ee93aab0820061adaef28bbc362
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
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
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
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
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
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
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
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
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
Andreas Gampe [Mon, 16 Apr 2018 18:35:35 +0000 (11:35 -0700)]
Merge "Revert "Frameworks/base: Compiled-classes support"" am:
087bae3ffe am:
f6786aeb64
am:
42f4090f85
Change-Id: I3717a17cecce29ebee794fae3a76eab816d0ff28
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Add new function to get audio state" into pi-dev
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
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
Beverly [Mon, 16 Apr 2018 18:24:23 +0000 (11:24 -0700)]
Merge "Add logging to ScheduleConditionProvider" into pi-dev am:
8f308fd4e3
am:
4c024e0917
Change-Id: I70159e3611de6cbee89a867f0e3bacd8ddfac22e
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
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
Ricky Wai [Mon, 16 Apr 2018 18:19:00 +0000 (18:19 +0000)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev
Bryce Lee [Mon, 16 Apr 2018 18:18:10 +0000 (11:18 -0700)]
Merge "Remove temporary logging." into pi-dev am:
216b50ad97
am:
1f6cebfab1
Change-Id: I05f5b91406ad73aa8140bf36b1c2381667adcc88
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
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
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
Android Build Merger (Role) [Mon, 16 Apr 2018 17:48:05 +0000 (17:48 +0000)]
Merge "Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev am:
356feb53b6 am:
789ffb45c5"
TreeHugger Robot [Mon, 16 Apr 2018 17:47:38 +0000 (17:47 +0000)]
Merge "Add memory usage tests for various scripts"
Ryan Mitchell [Mon, 16 Apr 2018 17:47:31 +0000 (10:47 -0700)]
Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev am:
356feb53b6
am:
789ffb45c5
Change-Id: I577bd1b6a7de0a81fbb5f23a0f31e3f5f5352d4b
Derek Sollenberger [Mon, 16 Apr 2018 17:43:12 +0000 (10:43 -0700)]
Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev am:
1c70ecb455
am:
b22ffad7f6
Change-Id: Ib5b59f780003b30b43219288b4153b20b2db1032
Isha Bobra [Mon, 16 Apr 2018 17:38:40 +0000 (10:38 -0700)]
The file CachedBluetoothDeviceManager.java performs synchronization at class level. This CL just adds the missing synchronization bits. am:
d467da7309
am:
b019b0b361
Change-Id: I321c60932e915520867099b80be2ac93060729e9
TreeHugger Robot [Mon, 16 Apr 2018 17:38:34 +0000 (17:38 +0000)]
Merge "Add logging to ScheduleConditionProvider" into pi-dev
Bryce Lee [Mon, 16 Apr 2018 17:36:45 +0000 (17:36 +0000)]
Merge "Remove temporary logging." into pi-dev
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
Jeff Sharkey [Mon, 16 Apr 2018 17:31:41 +0000 (10:31 -0700)]
Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev am:
f78b8ce258
am:
563a57bcf9
Change-Id: I9b5b2fc72188258326cc875457886370cb20e4fd
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
Chavi Weingarten [Mon, 16 Apr 2018 17:25:52 +0000 (10:25 -0700)]
Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev am:
2754777d30
am:
7d710b90ca
Change-Id: Iaaf71070e73603f58bc467a913655948de37e4fb
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
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
Jeff Sharkey [Mon, 16 Apr 2018 17:17:37 +0000 (10:17 -0700)]
Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev am:
e0fe6df357
am:
0cd9173ad3
Change-Id: I82d0ba458b4caf71bd7bf6719b027bd89767709d
Ryan Mitchell [Mon, 16 Apr 2018 17:15:53 +0000 (17:15 +0000)]
Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev
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
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
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
Isha Bobra [Mon, 16 Apr 2018 17:03:05 +0000 (10:03 -0700)]
Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev am:
ed344d1753
am:
c19f0a6649
Change-Id: I315316c0c50c94689ba80e548d554f73fa63043d
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
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
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
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
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
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
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
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
Michael Wright [Mon, 16 Apr 2018 16:36:39 +0000 (09:36 -0700)]
Merge "Convert the BrightnessController to a log scale control." into pi-dev am:
56a5620b41
am:
b8a9a324f7
Change-Id: I7a6e558cb8ae9b8a065f1293380c6b899ec12c4c
Treehugger Robot [Mon, 16 Apr 2018 16:33:24 +0000 (16:33 +0000)]
Merge "Revert "Frameworks/base: Compiled-classes support""
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
Bill Yi [Mon, 16 Apr 2018 16:29:37 +0000 (09:29 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
1bf77e9021 -s ours
am:
c2b7c26c48 -s ours
Change-Id: I2858ac4ff5412f7fd7e822cfe198dcb92e1bb9a1
Adrian Roos [Mon, 16 Apr 2018 16:25:13 +0000 (09:25 -0700)]
Merge changes I478047cc,Ibe16ffd7 into pi-dev am:
892ee93977
am:
21c2c55336
Change-Id: I125d3b4725c299f90531d3a42c8c00a837508b72
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
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
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
Makoto Onuki [Mon, 16 Apr 2018 16:16:12 +0000 (09:16 -0700)]
Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev am:
8f9fce0680
am:
8868d5882b
Change-Id: I8c31d778af05594a970bafac9dd73b78e7f66ccc
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
TreeHugger Robot [Mon, 16 Apr 2018 16:08:18 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
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
TreeHugger Robot [Mon, 16 Apr 2018 16:02:27 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Makoto Onuki [Mon, 16 Apr 2018 16:01:27 +0000 (09:01 -0700)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev am:
167032ab00
am:
6b5cf230d2
Change-Id: I3babad7c48c8b365b7875af768a7d61fcb97fd9f
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
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
Beverly [Mon, 16 Apr 2018 15:42:40 +0000 (11:42 -0400)]
Add logging to ScheduleConditionProvider
Test: n/a
Bug:
77906756
Change-Id: Icfc0cbaf6d53315e437ac3ea3ab693b3e0703d2f
Adrian Roos [Mon, 16 Apr 2018 15:41:09 +0000 (08:41 -0700)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev am:
26c25f0033
am:
d84dad6eb4
Change-Id: Iac830e536f3beef53d26d44789afbe173e35ba3b
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
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
Makoto Onuki [Mon, 16 Apr 2018 15:32:20 +0000 (15:32 +0000)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev
David Brazdil [Mon, 16 Apr 2018 15:32:17 +0000 (08:32 -0700)]
Merge "Add more hidden API on light greylist" into pi-dev am:
8ef1cb9d10
am:
041acf45b1
Change-Id: I1be1a3625043c45de63e5f3d341a9ec05242ddd6
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
TreeHugger Robot [Mon, 16 Apr 2018 15:20:04 +0000 (15:20 +0000)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
OSDN Git Service
