OSDN Git Service
Android Build Merger (Role) [Fri, 26 Jan 2018 00:00:44 +0000 (00:00 +0000)]
Merge changes from topic "am-
56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp
am:
33fc64360a
Change-Id: I37f0181e69f11c13e01a33f68f687c5810a4f865
Android Build Merger (Role) [Thu, 25 Jan 2018 23:47:28 +0000 (23:47 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours am:
6ccac2ffc3 -s ours
am:
6e0c678836 -s ours
Change-Id: I127c7d6efceb5ac22e8c16e71cc531912f6b1b5c
TreeHugger Robot [Thu, 25 Jan 2018 23:25:48 +0000 (23:25 +0000)]
Merge "Don't take screenshot when no WSA surfaces are visible."
Android Build Merger (Role) [Thu, 25 Jan 2018 23:23:05 +0000 (23:23 +0000)]
Merge "Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d am:
5ba62a2194" into oc-mr1-dev-plus-aosp am:
0bde9c4355"
Android Build Merger (Role) [Thu, 25 Jan 2018 23:22:31 +0000 (23:22 +0000)]
Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d am:
5ba62a2194" into oc-mr1-dev-plus-aosp
am:
0bde9c4355
Change-Id: Id17724faabe77fb7eaad7d3a7e009fb57f0d23d0
Dmitry Dementyev [Thu, 25 Jan 2018 23:15:50 +0000 (23:15 +0000)]
Merge "Handle case when PlatformKey is invalid."
Android Build Merger (Role) [Thu, 25 Jan 2018 23:06:23 +0000 (23:06 +0000)]
Merge "Merge "Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98 am:
ebc0afd811" into oc-mr1-dev-plus-aosp am:
954ba2c6a1"
Android Build Merger (Role) [Thu, 25 Jan 2018 23:03:11 +0000 (23:03 +0000)]
Merge "Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98 am:
ebc0afd811" into oc-mr1-dev-plus-aosp
am:
954ba2c6a1
Change-Id: I218eb054ef0da896c72674c597249c6a5120500d
TreeHugger Robot [Thu, 25 Jan 2018 22:59:32 +0000 (22:59 +0000)]
Merge "Update documentation for the clock parameters"
TreeHugger Robot [Thu, 25 Jan 2018 22:58:49 +0000 (22:58 +0000)]
Merge "Store WebView package signatures as Signatures instead of Strings"
TreeHugger Robot [Thu, 25 Jan 2018 22:58:15 +0000 (22:58 +0000)]
Merge "MediaPlayer2: remove unused methods"
Android Build Merger (Role) [Thu, 25 Jan 2018 22:53:27 +0000 (22:53 +0000)]
Merge changes from topic "am-
016e80a61e3c432b8a1915663d9a8fb1"
* changes:
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp am:
3a96381c69
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours am:
1ed0a31ee3 -s ours
Android Build Merger (Role) [Thu, 25 Jan 2018 22:52:50 +0000 (22:52 +0000)]
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
am:
3a96381c69
Change-Id: Ie1fb2e5843f151447de728348a64eb0b5a8699b5
TreeHugger Robot [Thu, 25 Jan 2018 22:47:54 +0000 (22:47 +0000)]
Merge "Add AbstractThreadedSyncAdapter#onUnsyncableAccount API"
TreeHugger Robot [Thu, 25 Jan 2018 22:38:00 +0000 (22:38 +0000)]
Merge "Move correct stack to front when split-screen is dismissed"
Android Build Merger (Role) [Thu, 25 Jan 2018 22:37:07 +0000 (22:37 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours
am:
1ed0a31ee3 -s ours
Change-Id: I9cbde4b6406e394293ad3ad51dc6000f7c68e179
Matthew Fritze [Thu, 25 Jan 2018 22:25:54 +0000 (22:25 +0000)]
Merge "Add Setting Slices Contract file"
Android Build Merger (Role) [Thu, 25 Jan 2018 22:24:12 +0000 (22:24 +0000)]
Merge changes from topic "am-
56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4 am:
94b7fafc69 am:
e977655e31
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours am:
6ccac2ffc3 -s ours
Android Build Merger (Role) [Thu, 25 Jan 2018 22:23:29 +0000 (22:23 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4 am:
94b7fafc69
am:
e977655e31
Change-Id: I7e50ca49c650aca991556f6d99c926633183bd89
Android Build Merger (Role) [Thu, 25 Jan 2018 22:22:00 +0000 (22:22 +0000)]
Merge "Merge "Fill in methods in EuiccCardController." am:
197f072da2 am:
d143bb628a am:
d19ef3fa1b"
TreeHugger Robot [Thu, 25 Jan 2018 22:21:30 +0000 (22:21 +0000)]
Merge "Update to the ActivityManager proto"
Holly Jiuyu Sun [Thu, 25 Jan 2018 22:21:13 +0000 (22:21 +0000)]
Merge "Fill in methods in EuiccCardController." am:
197f072da2 am:
d143bb628a
am:
d19ef3fa1b
Change-Id: I8189d3b34e4966c873e689c8c90ca6a8f2b2ec49
Android Build Merger (Role) [Thu, 25 Jan 2018 22:20:40 +0000 (22:20 +0000)]
Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d am:
5ba62a2194" into oc-mr1-dev-plus-aosp
Hugo Benichi [Thu, 25 Jan 2018 22:19:53 +0000 (22:19 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d
am:
5ba62a2194
Change-Id: I6c30a47ed35394d63b266250e3525976844b0e8f
Android Build Merger (Role) [Thu, 25 Jan 2018 22:17:14 +0000 (22:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours
am:
6ccac2ffc3 -s ours
Change-Id: Idf30f2ec1c917c94cdc27959df184713db36bef9
Android Build Merger (Role) [Thu, 25 Jan 2018 22:13:13 +0000 (22:13 +0000)]
Merge "Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98 am:
ebc0afd811" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 25 Jan 2018 22:10:31 +0000 (22:10 +0000)]
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac am:
38508aeaf5
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours
Andreas Gampe [Thu, 25 Jan 2018 22:10:27 +0000 (22:10 +0000)]
Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98
am:
ebc0afd811
Change-Id: Ie8b991014a43ca4fba83aeab3ba826996d2813df
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:56 +0000 (22:08 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae am:
6c1ecb973c am:
876a1f75a3
am:
06e56a4086
Change-Id: I9a000a352000e4b4faf594794f9366572a98b447
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:51 +0000 (22:08 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac
am:
38508aeaf5
Change-Id: Icf34d805cfd9274e1d00dd35b4db8afa1356742b
Holly Jiuyu Sun [Thu, 25 Jan 2018 22:06:08 +0000 (22:06 +0000)]
Merge "Fill in methods in EuiccCardController." am:
197f072da2
am:
d143bb628a
Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd
Android Build Merger (Role) [Thu, 25 Jan 2018 22:04:58 +0000 (22:04 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4
am:
94b7fafc69
Change-Id: Id25852c4f17eb92cf9bda17a5670bcb104ca0f78
Android Build Merger (Role) [Thu, 25 Jan 2018 22:02:48 +0000 (22:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours
am:
ea52aec628 -s ours
Change-Id: I3afa944070a378a25dd38551cfd02e397ec7f298
Android Build Merger (Role) [Thu, 25 Jan 2018 22:01:50 +0000 (22:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours am:
114cd10ac9 -s ours am:
78578a1294 -s ours
am:
ed4ea1e66a -s ours
Change-Id: I2eab9f0eb7f7d4e0a9f9fe7daeecb472dc9b0e9e
Android Build Merger (Role) [Thu, 25 Jan 2018 22:01:14 +0000 (22:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours
am:
a8e2306430 -s ours
Change-Id: I900c69922ed9ca74c8d23dc5ac34678177f0d373
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:08 +0000 (21:56 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae am:
6c1ecb973c
am:
876a1f75a3
Change-Id: I0310d50282b343261575d20cda3536667c8478b9
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:02 +0000 (21:56 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours am:
b8bc53ecc3 -s ours am:
d68ab1fd08 -s ours"
Android Build Merger (Role) [Thu, 25 Jan 2018 21:55:39 +0000 (21:55 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours am:
b8bc53ecc3 -s ours
am:
d68ab1fd08 -s ours
Change-Id: Ie0da2e283b1807b5d0986433f1c7dd3c1b727a86
Mady Mellor [Thu, 25 Jan 2018 21:55:21 +0000 (21:55 +0000)]
Merge "Update Keyguard to use RowContent / ListContent instead of SliceQuery where possible"
Hugo Benichi [Thu, 25 Jan 2018 21:55:08 +0000 (21:55 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback"
am:
93b1787a3d
Change-Id: Ife421f2612b0bfc2d6be5c6d174d24abd4d2e2fb
Android Build Merger (Role) [Thu, 25 Jan 2018 21:53:50 +0000 (21:53 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa
am:
981bc5a1ac
Change-Id: I2a52f4b62e872e32d07e0e994c90282fa20bc946
TreeHugger Robot [Thu, 25 Jan 2018 21:53:12 +0000 (21:53 +0000)]
Merge "VideoView2: Remove APIs supported by MediaSession"
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:53 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours am:
114cd10ac9 -s ours
am:
78578a1294 -s ours
Change-Id: I39d1e16f34fea09009c039a955040e811988d422
Andreas Gampe [Thu, 25 Jan 2018 21:50:42 +0000 (21:50 +0000)]
Merge "ActivityManager: Add support for agents on startup"
am:
d5cba89b98
Change-Id: Iee82ac1a08183857ea4fcf2d67b99dede5d5a2ae
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:18 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours
am:
cd4371f3cc -s ours
Change-Id: Ie76e94193cbb2c18fbe4d481b8b4bd0b44648488
Android Build Merger (Role) [Thu, 25 Jan 2018 21:49:42 +0000 (21:49 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev
am:
f310c792d4
Change-Id: Ifc8e1838bea63b3401dbd41e2d1dd04ca67b1eb2
Android Build Merger (Role) [Thu, 25 Jan 2018 21:48:48 +0000 (21:48 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd
am:
8eb39fb0f4 -s ours
Change-Id: Iadcf60e51485dc0952c6f7800a996e91585854a5
Holly Jiuyu Sun [Thu, 25 Jan 2018 21:47:46 +0000 (21:47 +0000)]
Merge "Fill in methods in EuiccCardController."
am:
197f072da2
Change-Id: I9d8db8ef23c7a469b38748ba8fd4b3a91ca4506e
Android Build Merger (Role) [Thu, 25 Jan 2018 21:46:22 +0000 (21:46 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
am:
806b4573aa
Change-Id: I1cfe38aa5a80dd142ef80375957766ce6b8daf99
Android Build Merger (Role) [Thu, 25 Jan 2018 21:45:31 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
am:
0a09cd4b21 -s ours
Change-Id: I939c7d74e9c575b6ed205dc5713579bb03cb31d5
TreeHugger Robot [Thu, 25 Jan 2018 21:39:44 +0000 (21:39 +0000)]
Merge "Deal gracefully with cancel of nonexistent jobs"
TreeHugger Robot [Thu, 25 Jan 2018 21:32:39 +0000 (21:32 +0000)]
Merge "Update cross_profile_apps_thumbnail_enter as per task_open_enter"
TreeHugger Robot [Thu, 25 Jan 2018 21:30:22 +0000 (21:30 +0000)]
Merge "Internal Framework changes needed by DocumentUI's ScopedAccessProvider:"
Robert Shih [Thu, 25 Jan 2018 21:27:39 +0000 (21:27 +0000)]
Merge "MediaExtractor: getSampleSize API"
TreeHugger Robot [Thu, 25 Jan 2018 21:19:22 +0000 (21:19 +0000)]
Merge "Disable statsd that was accidentally enabled in ag/
3480570"
TreeHugger Robot [Thu, 25 Jan 2018 21:14:44 +0000 (21:14 +0000)]
Merge "Disable quick step when notification is open"
TreeHugger Robot [Thu, 25 Jan 2018 20:50:15 +0000 (20:50 +0000)]
Merge "Fade the quick scrub track when nav bar intensity changes"
TreeHugger Robot [Thu, 25 Jan 2018 20:31:07 +0000 (20:31 +0000)]
Merge "add getMetrics() apis for AudioTrack and AudioRecord"
Wei Jia [Thu, 25 Jan 2018 18:13:42 +0000 (10:13 -0800)]
MediaPlayer2: remove unused methods
Also use shared lib of libutils.
Test: MediaPlayer2 plays
Bug:
63934228
Change-Id: I6f4f4e927cccd11a0e43c84347bcdc4e3a3b88de
TreeHugger Robot [Thu, 25 Jan 2018 20:18:28 +0000 (20:18 +0000)]
Merge "Fix missing textservices dump in 'adb bugreport'"
Dmitry Dementyev [Wed, 24 Jan 2018 19:11:40 +0000 (11:11 -0800)]
Handle case when PlatformKey is invalid.
When Platform key is invalidated, all applicatio keys wraped into it
needs to be marked as unrecoverable.
It can happen when user removes screen lock.
Bug:
72443379
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7ae257f8fdb4b6abf789887f15b02a2fe370dfb8
Android Build Merger (Role) [Thu, 25 Jan 2018 19:25:06 +0000 (19:25 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae
am:
6c1ecb973c
Change-Id: Ie305f8b8f404f9dcf19f53d51fca7eafed03faaa
Android Build Merger (Role) [Thu, 25 Jan 2018 19:23:56 +0000 (19:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours
am:
b8bc53ecc3 -s ours
Change-Id: Ia2241da1274d0436eb8eafc70addd55f8d99c45b
Treehugger Robot [Thu, 25 Jan 2018 19:23:18 +0000 (19:23 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback"
Android Build Merger (Role) [Thu, 25 Jan 2018 19:21:27 +0000 (19:21 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours
am:
114cd10ac9 -s ours
Change-Id: Ia0342f04f3fca736521746aa7008bd40d84f0d1f
TreeHugger Robot [Thu, 25 Jan 2018 19:16:47 +0000 (19:16 +0000)]
Merge "New error color"
Android Build Merger (Role) [Thu, 25 Jan 2018 19:14:57 +0000 (19:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours
am:
fa70de88c5 -s ours
Change-Id: Iab847c723ba9b240967d759276c06c9643955ea6
Calin Juravle [Thu, 25 Jan 2018 19:10:23 +0000 (19:10 +0000)]
Merge "Extend the ArtManager profiling API to cover boot image profiling"
Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:52 +0000 (19:09 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev
am:
41ae4b7eae
Change-Id: Ic40433dd8e426ee0b13cfd04c218e84d5a089bef
Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:05 +0000 (19:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
am:
77243e2d28 -s ours
Change-Id: I51635f606e53d517a340e656fd28bf3be58e7acd
Android Build Merger (Role) [Thu, 25 Jan 2018 19:04:31 +0000 (19:04 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93
am:
19f08130b1 -s ours
Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c
Felipe Leme [Wed, 24 Jan 2018 16:43:34 +0000 (08:43 -0800)]
Internal Framework changes needed by DocumentUI's ScopedAccessProvider:
- Changed AM.getGrantedUriPermissions() API.
- Made DocumentsContract.PATH_TREE public.
Also fixed related AM methods to use explicit for on some loops.
Bug:
63720392
Test: manual verification
Change-Id: I33bdcb949f4301534bd8467c8018d6f03b4588a4
TreeHugger Robot [Thu, 25 Jan 2018 19:02:39 +0000 (19:02 +0000)]
Merge "Tag platform protos with right privacy level."
Mike Digman [Thu, 25 Jan 2018 19:00:08 +0000 (19:00 +0000)]
Merge "Log rotation suggestion events in SystemUI"
Calin Juravle [Thu, 25 Jan 2018 18:58:09 +0000 (18:58 +0000)]
Merge "[framework] Extend profile operations to take the profile name"
yro [Thu, 25 Jan 2018 18:55:08 +0000 (10:55 -0800)]
Disable statsd that was accidentally enabled in ag/
3480570
Test: manual test
Change-Id: I57176203a1ca7d0b5639119642335e3e9a1e4e4c
TreeHugger Robot [Thu, 25 Jan 2018 18:55:45 +0000 (18:55 +0000)]
Merge "Statsd broadcasts when it is alive"
TreeHugger Robot [Thu, 25 Jan 2018 18:53:13 +0000 (18:53 +0000)]
Merge "Fix pulsing notification overlap"
Matthew Ng [Tue, 23 Jan 2018 20:39:55 +0000 (12:39 -0800)]
Disable quick step when notification is open
When notification shade is open, any swipe gestures should only affect
the notification shade. When the shade is gone, users should be able to
interact with quick step again.
Change-Id: I18bede697ae81b8010f10bf5e538d3142b39c86f
Fixes:
72185561
Test: manual
Igor Viarheichyk [Thu, 25 Jan 2018 18:47:12 +0000 (18:47 +0000)]
Merge "Fix translations detection for BCP 47 locales."
TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:42:47 +0000 (18:42 +0000)]
Merge "Fix surface properties not getting applied correctly"
TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb
Import translations. DO NOT MERGE
chaviw [Wed, 10 Jan 2018 21:52:12 +0000 (13:52 -0800)]
Don't take screenshot when no WSA surfaces are visible.
Currently screenshots are taken even when no WSA surfaces are visible.
This results in black screenshots geting taken and later used to show in
recents. Restore previous behavior where screenshots are not taken for
apps that don't have any WSA surfaces visible.
Test: Enter split screen. Put an app in the secondary screen. Exit
split screen and enter recents. App that was secondary should now contain
a correct screenshot instead of displaying a black screenshot.
Change-Id: I1417afa0bf6602f3ca7ed55e96fc94bce5f5b4fe
TreeHugger Robot [Thu, 25 Jan 2018 18:28:25 +0000 (18:28 +0000)]
Merge "Adding intent generation for dates and flights"
TreeHugger Robot [Thu, 25 Jan 2018 18:27:55 +0000 (18:27 +0000)]
Merge "Shorter date format on lock screen and AOD"
Adam Stone [Thu, 25 Jan 2018 18:25:40 +0000 (18:25 +0000)]
Merge "Enabling the getMetrics call in MediaDrm"
TreeHugger Robot [Thu, 25 Jan 2018 18:16:35 +0000 (18:16 +0000)]
Merge "Adding privacy tags to PowerManagerService proto."
Treehugger Robot [Thu, 25 Jan 2018 18:08:07 +0000 (18:08 +0000)]
Merge "ActivityManager: Add support for agents on startup"
Artem Iglikov [Thu, 25 Jan 2018 18:06:49 +0000 (18:06 +0000)]
Merge "Revert "Make idiomatic use of ApkAssets and AssetManager""
TreeHugger Robot [Thu, 25 Jan 2018 18:05:15 +0000 (18:05 +0000)]
Merge "Remove unused system api Window.setDisableWallpaperTouchEvents"
TreeHugger Robot [Thu, 25 Jan 2018 17:59:24 +0000 (17:59 +0000)]
Merge "Add key to store location changer"
TreeHugger Robot [Thu, 25 Jan 2018 17:57:35 +0000 (17:57 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
TreeHugger Robot [Thu, 25 Jan 2018 17:52:25 +0000 (17:52 +0000)]
Merge "Skip priv app full apk verification if has verify"
TreeHugger Robot [Thu, 25 Jan 2018 17:49:26 +0000 (17:49 +0000)]
Merge "Finish broadcast radio HAL 2.0 radio service."
TreeHugger Robot [Thu, 25 Jan 2018 17:31:38 +0000 (17:31 +0000)]
Merge "Add confirmation UI protocol to Keystore AIDL definition"
Jorim Jaggi [Thu, 25 Jan 2018 16:41:24 +0000 (17:41 +0100)]
Fix surface properties not getting applied correctly
When we switched to calling prepareSurfaces in
applySurfacesChangesTransaction, we switched from
computeShownFrameLocked to prepareSurfaceLocked, which has an
additional check of waiting for opening, which caused that a
surface size change from a layout never was applied.
The original comment on that check doesn't make sense anymore,
given that we don't animate in prepareSurfaces anymore, so we can
just go ahead and remove that check.
Test: go/wm-smoke
Test: Open voice input activity
Change-Id: I46664fd3c8f9a5c549fdb245125f05f290162ebf
Fixes:
71787613
TreeHugger Robot [Thu, 25 Jan 2018 17:24:17 +0000 (17:24 +0000)]
Merge "Generating StrongBox backed keys"
Holly Jiuyu Sun [Thu, 25 Jan 2018 17:22:50 +0000 (17:22 +0000)]
Merge "Fill in methods in EuiccCardController."
OSDN Git Service
