OSDN Git Service
George Mount [Mon, 11 Sep 2017 17:40:46 +0000 (17:40 +0000)]
Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev
am:
2f35f15ab0
Change-Id: Ie360f3af438f0c1b58620048258d7ba666363744
Bryce Lee [Mon, 11 Sep 2017 17:25:41 +0000 (17:25 +0000)]
Merge "Revert "Make sure top activity is stopped on sleep if paused."" into oc-mr1-dev
am:
8af60e4c0e
Change-Id: I3469ba71e2191136b94325101bf340f825c4fd14
TreeHugger Robot [Mon, 11 Sep 2017 17:25:33 +0000 (17:25 +0000)]
Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev
Bryce Lee [Mon, 11 Sep 2017 17:10:28 +0000 (17:10 +0000)]
Merge "Revert "Make sure top activity is stopped on sleep if paused."" into oc-mr1-dev
Todd Kennedy [Mon, 11 Sep 2017 17:07:42 +0000 (17:07 +0000)]
Merge "also verify existence of a package" into oc-mr1-dev
am:
8cfb2f6310
Change-Id: Id4b48184275d44b5de3bf459375ca2dae3fb0eb7
Todd Kennedy [Mon, 11 Sep 2017 16:55:41 +0000 (16:55 +0000)]
Merge "Don't install package if it's required to be known" into oc-mr1-dev
am:
57d42ed0f9
Change-Id: I51cd490d1d2df6ededf26e3f980ad1c21e4b46a0
TreeHugger Robot [Mon, 11 Sep 2017 16:47:57 +0000 (16:47 +0000)]
Merge "also verify existence of a package" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 16:39:42 +0000 (16:39 +0000)]
Merge "Don't install package if it's required to be known" into oc-mr1-dev
Bryce Lee [Mon, 11 Sep 2017 16:31:15 +0000 (16:31 +0000)]
Revert "Make sure top activity is stopped on sleep if paused."
This reverts commit
01cffc296b1c40c3fbc7533c9ef885807a8dbc6c.
Reason for revert: causing b/
65498626
Bug:
65457314
Fixes:
65498626
Change-Id: I47ddfcccaf94ceadf2104973402b3cdc50876a36
Colin Cross [Mon, 11 Sep 2017 16:25:24 +0000 (16:25 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources" into oc-mr1-dev
am:
b7c2d0abaf -s ours
Change-Id: Ieb894fa1b8f87cd8847e034f29e8d2062ac1df9e
TreeHugger Robot [Mon, 11 Sep 2017 16:13:40 +0000 (16:13 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources" into oc-mr1-dev
Android Build Merger (Role) [Mon, 11 Sep 2017 15:14:57 +0000 (15:14 +0000)]
Merge "resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours am:
9c358ccbe2 -s ours am:
72bbe1d631 -s ours am:
c6d39d47c5 -s ours" into oc-mr1-dev-plus-aosp
Tony Mak [Mon, 11 Sep 2017 15:13:14 +0000 (15:13 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours am:
9c358ccbe2 -s ours am:
72bbe1d631 -s ours
am:
c6d39d47c5 -s ours
Change-Id: I6c10c4d27c64cfbafc45b0535663591f8a320362
Tony Mak [Mon, 11 Sep 2017 15:12:34 +0000 (15:12 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours am:
9c358ccbe2 -s ours am:
72bbe1d631 -s ours
am:
77a3aed507 -s ours
Change-Id: Iacfc275c1b1a8262289413a53bee77e5782a2df4
Tony Mak [Mon, 11 Sep 2017 15:05:34 +0000 (15:05 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours am:
9c358ccbe2 -s ours
am:
72bbe1d631 -s ours
Change-Id: I85f10646a50af78fdeb8f80411350ecaec06ac40
Tony Mak [Mon, 11 Sep 2017 15:05:29 +0000 (15:05 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours am:
9c358ccbe2 -s ours
am:
72bbe1d631 -s ours
Change-Id: I90da7d1636e4692adfcba36b702d8262b3fe3b4e
Tony Mak [Mon, 11 Sep 2017 14:52:59 +0000 (14:52 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours
am:
9c358ccbe2 -s ours
Change-Id: I18c8460309c8330504d50eb16ce3cb39b36d2ee1
Dianne Hackborn [Mon, 11 Sep 2017 14:50:53 +0000 (14:50 +0000)]
Merge "Work around issue #
65333586: Took phone out of pocket..." into oc-mr1-dev
am:
f04b643ca8
Change-Id: Ib788a6ced4e7463f2696ac31362274f88192793d
Tony Mak [Mon, 11 Sep 2017 14:43:33 +0000 (14:43 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2
am:
79a32d0a8a -s ours
Change-Id: I4b97babe4f5259c71bb301d08318e09eb4560e37
TreeHugger Robot [Mon, 11 Sep 2017 14:40:02 +0000 (14:40 +0000)]
Merge "Work around issue #
65333586: Took phone out of pocket..." into oc-mr1-dev
Tony Mak [Mon, 11 Sep 2017 14:36:08 +0000 (14:36 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3
am:
4453c3cda2
Change-Id: Ic48643564a3685bc602c66901c9761b741b148a5
Tony Mak [Mon, 11 Sep 2017 14:28:44 +0000 (14:28 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357
am:
68cce397b3
Change-Id: Ieb10d27e72646260f0c75535485a6fe11efe2a32
Tony Mak [Mon, 11 Sep 2017 14:17:10 +0000 (14:17 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227
am:
34377e0357
Change-Id: Ief87ce5e1dc9e5b424d70e72144084aa778ca0d6
Tony Mak [Mon, 11 Sep 2017 14:04:00 +0000 (14:04 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev
am:
d7dcc3e227
Change-Id: Ie10cba479c7d83ed001b863c648976a26ae30756
Tony Mak [Mon, 11 Sep 2017 10:38:07 +0000 (11:38 +0100)]
resolve merge conflicts of
56a2b529373b to nyc-dev
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Change-Id: I81183e5b5bc702fb245a6a51afe6709c5b9dd3de
Andrei Stingaceanu [Mon, 11 Sep 2017 09:44:47 +0000 (09:44 +0000)]
Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev
am:
04b6095082
Change-Id: I1467a1af9a9bc0c23435b1e3b34a4ac257b9244c
Andrei Stingaceanu [Mon, 11 Sep 2017 09:39:22 +0000 (09:39 +0000)]
Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev
Tony Mak [Mon, 11 Sep 2017 08:44:22 +0000 (08:44 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c am:
a1cbcf5513
am:
220e7c1628
Change-Id: Ib882539bf0f362d3dbd279418d37b8fd56a9d8f1
Tony Mak [Mon, 11 Sep 2017 08:36:08 +0000 (08:36 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c
am:
a1cbcf5513
Change-Id: I37cafa9ee6e166e27c074e6317a6a818fe9e87a5
Tony Mak [Mon, 11 Sep 2017 08:26:32 +0000 (08:26 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
am:
328c129f4c
Change-Id: If2d6418cf2a71b2ae3094349101e71903c016224
TreeHugger Robot [Mon, 11 Sep 2017 08:14:19 +0000 (08:14 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
Jaewan Kim [Mon, 11 Sep 2017 06:36:21 +0000 (06:36 +0000)]
Merge "TV PIP: Keep the PIP at the bottom for RTL language" into oc-mr1-dev
am:
1b0ca0899d
Change-Id: I2c027c1f22c6cbe25b3c43726332b453f5594c8f
TreeHugger Robot [Mon, 11 Sep 2017 06:28:35 +0000 (06:28 +0000)]
Merge "TV PIP: Keep the PIP at the bottom for RTL language" into oc-mr1-dev
Android Build Merger (Role) [Mon, 11 Sep 2017 06:14:51 +0000 (06:14 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours am:
d5c753a6e5 -s ours am:
81f4636ffa -s ours am:
ac5fb9ab78 -s ours" into oc-mr1-dev-plus-aosp
Suprabh Shukla [Mon, 11 Sep 2017 06:08:29 +0000 (06:08 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours am:
d5c753a6e5 -s ours am:
81f4636ffa -s ours
am:
6ccf40be0b -s ours
Change-Id: I5435c5e3e9804cb41f01d4cb644ffa2d39d7533f
Suprabh Shukla [Mon, 11 Sep 2017 06:08:20 +0000 (06:08 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours am:
d5c753a6e5 -s ours am:
81f4636ffa -s ours
am:
ac5fb9ab78 -s ours
Change-Id: Ib9af5301ea57abfdb29da2dc77a432d466ddb5a2
Suprabh Shukla [Mon, 11 Sep 2017 05:49:46 +0000 (05:49 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours am:
d5c753a6e5 -s ours
am:
81f4636ffa -s ours
Change-Id: Ifc1ceea9b251086ded47e6a98186175e2291d17a
Suprabh Shukla [Mon, 11 Sep 2017 05:49:28 +0000 (05:49 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours am:
d5c753a6e5 -s ours
am:
81f4636ffa -s ours
Change-Id: I0202dee3d142d219df59547dfc571f006f9f72f2
Suprabh Shukla [Mon, 11 Sep 2017 05:35:27 +0000 (05:35 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours
am:
d5c753a6e5 -s ours
Change-Id: I337f3213d40930c9b844a7eb246b184d9681703f
Suprabh Shukla [Mon, 11 Sep 2017 05:21:07 +0000 (05:21 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours
am:
3beb50ba24 -s ours
Change-Id: Ife3545f0c707b9616e5d0c6026e93bc0132a09c6
Suprabh Shukla [Mon, 11 Sep 2017 05:09:32 +0000 (05:09 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours
am:
67f43835ad -s ours
Change-Id: I71f6d14cd5df5c556f4794ca581146c38d3af9c8
Suprabh Shukla [Mon, 11 Sep 2017 04:55:50 +0000 (04:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours
am:
6a48feaab8 -s ours
Change-Id: Ie05f69480ee2aec055dad3622072f3fc5e569e8a
Suprabh Shukla [Mon, 11 Sep 2017 04:41:52 +0000 (04:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours
am:
467ed9d15a -s ours
Change-Id: I81bac89584c667c35b7fff8ff3446c57c73cf617
Suprabh Shukla [Mon, 11 Sep 2017 04:29:03 +0000 (04:29 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours
am:
3f824a362f -s ours
Change-Id: Ice5595805d71402bbfbdda2efe44e180f346d54b
Suprabh Shukla [Mon, 11 Sep 2017 04:10:16 +0000 (04:10 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0
am:
4b8fb78007 -s ours
Change-Id: Idaff77e48bf3901ef0cbff54d3ceb19223a48338
Tony Mak [Mon, 11 Sep 2017 04:10:01 +0000 (04:10 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev am:
5e4b2b15ec am:
f1aea743fd
am:
d3d23ce12f
Change-Id: Ibedb132594d4f00b01d04e80516f53a455df82d1
Android Build Merger (Role) [Mon, 11 Sep 2017 04:05:37 +0000 (04:05 +0000)]
Merge "Merge "DPC should not be allowed to grant development permission" into oc-dev am:
5e4b2b15ec am:
f1aea743fd am:
0b80fb29b1" into oc-mr1-dev-plus-aosp
Tony Mak [Mon, 11 Sep 2017 04:01:14 +0000 (04:01 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev am:
5e4b2b15ec am:
f1aea743fd
am:
0b80fb29b1
Change-Id: Ic74a1f1609cf29b1a72943a966cf60f78e7b7004
Sanket Padawe [Mon, 11 Sep 2017 03:58:23 +0000 (03:58 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." am:
a90205492f am:
f0dd39f7d0
am:
b706659354
Change-Id: Ibdaf08aca01df5582ed3042ac956155df590adb5
Tony Mak [Mon, 11 Sep 2017 03:58:17 +0000 (03:58 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev am:
5e4b2b15ec
am:
f1aea743fd
Change-Id: I9d99b3f18aa86e8dd62cb9e9ec95b86b16895dbf
Tony Mak [Mon, 11 Sep 2017 03:53:03 +0000 (03:53 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev am:
5e4b2b15ec
am:
f1aea743fd
Change-Id: I80e7885580b9ac17eaf8d7f232684b357b1c84da
Sanket Padawe [Mon, 11 Sep 2017 03:51:14 +0000 (03:51 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." am:
a90205492f
am:
f0dd39f7d0
Change-Id: I66f4d857e4fb6e683063bb5543a992659f55a06c
Tony Mak [Mon, 11 Sep 2017 03:41:57 +0000 (03:41 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev
am:
5e4b2b15ec
Change-Id: I54c0be2c389aacb367b3c8c7e749475dced25f3c
Sanket Padawe [Mon, 11 Sep 2017 03:40:47 +0000 (03:40 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."
am:
a90205492f
Change-Id: I1d15e13cb3ae8fa8caf098e34587e3599b5bc967
Sanket Padawe [Mon, 11 Sep 2017 03:31:18 +0000 (03:31 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."
TreeHugger Robot [Mon, 11 Sep 2017 03:22:05 +0000 (03:22 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev
Android Build Merger (Role) [Sun, 10 Sep 2017 21:28:28 +0000 (21:28 +0000)]
Merge "Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours am:
84aa3f4c81 -s ours am:
a8e0d5f73a -s ours am:
05c679e9fa -s ours" into oc-mr1-dev-plus-aosp
Suprabh Shukla [Sun, 10 Sep 2017 21:22:15 +0000 (21:22 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours am:
84aa3f4c81 -s ours am:
a8e0d5f73a -s ours
am:
05c679e9fa -s ours
Change-Id: Id65020e45bea9cf9fe10e37cd52f48365d3b15c9
Suprabh Shukla [Sun, 10 Sep 2017 21:13:59 +0000 (21:13 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours am:
84aa3f4c81 -s ours am:
a8e0d5f73a -s ours
am:
568380565b -s ours
Change-Id: I66ceeba8cf15438705a339f76bcd78ae457c6442
Suprabh Shukla [Sun, 10 Sep 2017 21:00:56 +0000 (21:00 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours am:
84aa3f4c81 -s ours
am:
a8e0d5f73a -s ours
Change-Id: I34f6294cfa3d9e23bfe9b3f0edfb03da4fd5dfd2
Suprabh Shukla [Sun, 10 Sep 2017 21:00:47 +0000 (21:00 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours am:
84aa3f4c81 -s ours
am:
a8e0d5f73a -s ours
Change-Id: Id776a47b42146f8d9ba4419ee8872ebefac84ed3
Suprabh Shukla [Sun, 10 Sep 2017 20:47:27 +0000 (20:47 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours
am:
84aa3f4c81 -s ours
Change-Id: I701fa204e66a8dd239e3ed3913f734e8ea503049
Suprabh Shukla [Sun, 10 Sep 2017 20:29:17 +0000 (20:29 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b
am:
bf1b7e9030 -s ours
Change-Id: Ifcb9a5a08af1722bc5df28c470d4ca356b865acb
Suprabh Shukla [Sun, 10 Sep 2017 20:16:00 +0000 (20:16 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b
am:
4f31a88d4b
Change-Id: Ia97ee26a24e49809ad7484f850d256bc733ee239
Suprabh Shukla [Sun, 10 Sep 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124
am:
25ec24740b
Change-Id: I858f75717157bd9269bcd43d4198935302132d5a
Suprabh Shukla [Sun, 10 Sep 2017 20:00:05 +0000 (20:00 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361
am:
54f494ffc0
Change-Id: Ibbdf82686d13d9a554ef62774f140c57115118a3
Suprabh Shukla [Sun, 10 Sep 2017 19:48:10 +0000 (19:48 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229
am:
7d9e844124
Change-Id: Ifc197fbb16e1bb6773b2f08c7c62ca92f82238f7
Suprabh Shukla [Sun, 10 Sep 2017 19:47:46 +0000 (19:47 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73
am:
bf1b308361
Change-Id: Ia01d70256824947bed5e88e103bc263749404fbb
Suprabh Shukla [Sun, 10 Sep 2017 19:32:22 +0000 (19:32 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
am:
fc9e382229
Change-Id: I80e814ed0266b3868bd7039508bbc50b2e2a51aa
Suprabh Shukla [Sun, 10 Sep 2017 19:32:12 +0000 (19:32 +0000)]
Clearing up invalid entries when SyncStorageEngine starts
am:
5470469d73
Change-Id: I8ffaaf35be0e2586a5bdbbe5de6e6bd440e26017
TreeHugger Robot [Sun, 10 Sep 2017 19:25:54 +0000 (19:25 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
Lennart Wieboldt [Sun, 10 Sep 2017 18:02:40 +0000 (18:02 +0000)]
Merge "tests: remove LOCAL_CLANG" am:
e77be9c610 am:
24b36003d4
am:
7599be2e67
Change-Id: I5f2388ec80aa9aad27ef264c9012e27faaece08e
Lennart Wieboldt [Sun, 10 Sep 2017 17:52:12 +0000 (17:52 +0000)]
Merge "tests: remove LOCAL_CLANG" am:
e77be9c610
am:
24b36003d4
Change-Id: I505a6ddaa90658f0996cbaf7216023fdfa7c0409
Lennart Wieboldt [Sun, 10 Sep 2017 17:42:08 +0000 (17:42 +0000)]
Merge "tests: remove LOCAL_CLANG"
am:
e77be9c610
Change-Id: Ie2b3d0c5a6c0f30e8fd768720fb6a9e4ca45e207
Treehugger Robot [Sun, 10 Sep 2017 17:31:20 +0000 (17:31 +0000)]
Merge "tests: remove LOCAL_CLANG"
Lennart Wieboldt [Mon, 24 Jul 2017 22:20:24 +0000 (00:20 +0200)]
tests: remove LOCAL_CLANG
clang is the default compiler since Android nougat
Test: mma & verified it´s still build with clang
Change-Id: I9bfe0668eddf51dd56174fefc650a11002d38196
Signed-off-by: Lennart Wieboldt <lennart.1997@gmx.de>
Yohei Yukawa [Sun, 10 Sep 2017 05:39:50 +0000 (05:39 +0000)]
Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev
am:
a729236399
Change-Id: Ibc4e2f176cd46b6de4cc6f6e6f28e3309a00f1a2
TreeHugger Robot [Sun, 10 Sep 2017 05:31:42 +0000 (05:31 +0000)]
Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev
Felipe Leme [Sun, 10 Sep 2017 04:44:18 +0000 (04:44 +0000)]
Merge "Documented use of AutofillManager.notifyViewVisibilityChanged()" into oc-mr1-dev
am:
beff427903
Change-Id: I3281358455bae103eb8e5f9f8d375f44dd0a4803
TreeHugger Robot [Sun, 10 Sep 2017 04:37:35 +0000 (04:37 +0000)]
Merge "Documented use of AutofillManager.notifyViewVisibilityChanged()" into oc-mr1-dev
Dan Willemsen [Sun, 10 Sep 2017 02:05:05 +0000 (02:05 +0000)]
Merge changes I93cf24d4,I32e438ef am:
30798ad13a am:
c28d591b36
am:
59225490b8
Change-Id: I6cf57e951900b3df816070feee0d3bf92a6a5a7d
Dan Willemsen [Sun, 10 Sep 2017 02:03:31 +0000 (02:03 +0000)]
Rename aapt_defaults to aapt2_defaults am:
1cb5ab2dc1 -s ours am:
972a9d5318 -s ours
am:
0ebd09b708 -s ours
Change-Id: I7715ea26cb3fced4b1a2890d3fe4304e131ae93e
Dan Willemsen [Sun, 10 Sep 2017 01:54:18 +0000 (01:54 +0000)]
Merge changes I93cf24d4,I32e438ef am:
30798ad13a
am:
c28d591b36
Change-Id: Iae6cb26ba3e2bfb644cec722462c6fd17cc708eb
Dan Willemsen [Sun, 10 Sep 2017 01:52:51 +0000 (01:52 +0000)]
Rename aapt_defaults to aapt2_defaults am:
1cb5ab2dc1 -s ours
am:
972a9d5318 -s ours
Change-Id: I50a90f1ef7d6c92771a9d43295b2809620eecfe1
Dan Willemsen [Sun, 10 Sep 2017 01:50:28 +0000 (01:50 +0000)]
Merge "Convert libhidcommand_jni to Android.bp" am:
5a1e85eb71 -s ours am:
4731cc66e9 -s ours
am:
6a8d76776b -s ours
Change-Id: Iac7aac7d783b073a73847ba243566f9388f964fb
Dan Willemsen [Sun, 10 Sep 2017 01:44:06 +0000 (01:44 +0000)]
Merge changes I93cf24d4,I32e438ef
am:
30798ad13a
Change-Id: I0b178c8523d0c5829d731f6ed05cfa3fe89ad9b4
Dan Willemsen [Sun, 10 Sep 2017 01:42:39 +0000 (01:42 +0000)]
Rename aapt_defaults to aapt2_defaults
am:
1cb5ab2dc1 -s ours
Change-Id: I057a428765b57394471f8d1f7488231109d8f274
Dan Willemsen [Sun, 10 Sep 2017 01:39:14 +0000 (01:39 +0000)]
Merge "Convert libhidcommand_jni to Android.bp" am:
5a1e85eb71 -s ours
am:
4731cc66e9 -s ours
Change-Id: I5d67989fe9f502fb4222948e7b8c915302986e6b
Treehugger Robot [Sun, 10 Sep 2017 01:29:21 +0000 (01:29 +0000)]
Merge changes I93cf24d4,I32e438ef
* changes:
Convert host tools to Android.bp
Rename aapt_defaults to aapt2_defaults
Dan Willemsen [Sun, 10 Sep 2017 01:27:49 +0000 (01:27 +0000)]
Merge "Convert libhidcommand_jni to Android.bp"
am:
5a1e85eb71 -s ours
Change-Id: Ida8cfe3dd910c481f47f783ed80eb8d396b29a18
Treehugger Robot [Sun, 10 Sep 2017 01:18:28 +0000 (01:18 +0000)]
Merge "Convert libhidcommand_jni to Android.bp"
Yohei Yukawa [Sun, 10 Sep 2017 00:45:27 +0000 (17:45 -0700)]
Revert "Remove a compat hack SurfaceView#setWindowType()"
This CL reverts my previous CL [1] that aimed to get rid of
a nasty compatibility hack that was introduced for Bug
36345857.
For those who are interested in, what happenned are:
1. @hide method SurfaceView#setWindowType() was removed [2].
2. It broke some app (Bug
36345857). We had to work around
it by re-introducing SurfaceView#setWindowType()
temporarily [3].
3. Some app switched to the correct implementation when
running on Android O devices.
4. We removed that compatibility hack [1] (Bug
62054282).
5. Android O MR1 is set to be "REL" [4].
6. It broke some app, probably because of some unfortunate
mistake in the version check logic in that app.
7. We end up introducing the same hack again for O MR1.
[1]: Icee198c554de558cfa4ffe0b264064969839654e
7a1ad6d97ca1984789446211a986d5ad1b5c81e2
[2]: Ie56b6f7ab16f32d7fc459b8eba26594337ad55de
d5c7dd6da810a6b89151b337bea79fd817e6b72a
[3]: I5217f6417a73690ae8a978754218b7b089070fdd
3b5011afc9e17963607269bfb6665d04e3ab4ca1
[4]: I054e3ecff49803e61e7741753fe6764a567d72c4
62a835d0ef89e51f4a97fecf8576224551b545a5
Bug:
36345857
Bug:
62054282
Fixes:
65508814
Test: Manually verified that Bug
65508814 is not reproducible
Change-Id: If8a3f726789daa22f73e1962e938f071d3c09414
Dan Willemsen [Sat, 9 Sep 2017 22:32:43 +0000 (22:32 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp" am:
d928842ab6 am:
24041fe213
am:
950eeb20c2 -s ours
Change-Id: I853d86a330d0d0b07a9a846814bf65146ae13928
Dan Willemsen [Sat, 9 Sep 2017 22:21:40 +0000 (22:21 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp" am:
d928842ab6
am:
24041fe213
Change-Id: I0c179c30edf843c0e5bdb0eb267999f3ada39387
Dan Willemsen [Sat, 9 Sep 2017 22:11:38 +0000 (22:11 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp"
am:
d928842ab6
Change-Id: I0e0ff3d75ce5f9dc302052c1da057db8d5d35cd7
Treehugger Robot [Sat, 9 Sep 2017 22:00:33 +0000 (22:00 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp"
Dan Willemsen [Sat, 9 Sep 2017 19:54:02 +0000 (19:54 +0000)]
Merge changes Ia3bcece1,Icd26dc1e am:
ec462238f6 am:
c201a6bb7d
am:
9539d236e7
Change-Id: I2a5c73a54004c1aa378d25776de0d2080544137d
Dan Willemsen [Sat, 9 Sep 2017 19:43:54 +0000 (19:43 +0000)]
Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master am:
a97f4d4ac3
am:
21d5fdbbce
Change-Id: I7d2ca2f6c9b9c8522510d4e7ac1d9ded0167b38b
Dan Willemsen [Sat, 9 Sep 2017 19:38:40 +0000 (19:38 +0000)]
Merge changes Ia3bcece1,Icd26dc1e am:
ec462238f6
am:
c201a6bb7d
Change-Id: I3459188afc5a6d650e7f4e1a9b03e0b8edfbde71
Dan Willemsen [Sat, 9 Sep 2017 19:33:53 +0000 (19:33 +0000)]
Rename aapt_defaults to aapt2_defaults am:
7544b9cbb9
am:
6737dc9448
Change-Id: I78debad7c68e37bd935b881ad791a771c8ee86c7
OSDN Git Service
