Commit Graph

401041 Commits

Author SHA1 Message Date
TreeHugger Robot
99eff853a0 Merge "Explicit delay in View.java" 2019-01-24 04:14:00 +00:00
Valerie Hau
c51fbec471 Merge "Add setColor, setColorAlpha, and setColorDataspace to ASurfaceControl" 2019-01-24 04:10:46 +00:00
TreeHugger Robot
f879268e09 Merge "Implement onUserDataRemovalRequest" 2019-01-24 04:07:02 +00:00
Jack Yu
cf2f6e74ec [automerger skipped] Merge "Supported data handover in DcTracker/DataConnection/ApnContext" am: 56e1062ce3 am: e055bfa0fa
am: 332b5b5786 -s ours
am skip reason: change_id I1dfecbe48e230b3cab1b8b83e8d9f9dfd241752e with SHA1 faa7a52543 is in history

Change-Id: Ideb905b4b17480ba4c9ec733d074698a9e22d31b
2019-01-23 19:50:33 -08:00
Chen Xu
4ec3b1c17a Merge "add missing permission check in PhoneStateListener" am: feb7d14aa8 am: b102235018
am: 18aa5e76de

Change-Id: I05a42ca0faee0508ba50d73abcd3e3cb87cd6580
2019-01-23 19:38:18 -08:00
TreeHugger Robot
c8c1a25637 Merge "New ContentCapture API: ContentCatpureContext.action" 2019-01-24 03:34:26 +00:00
TreeHugger Robot
fd8f7cd721 Merge "Correct jni declarations of input handle" 2019-01-24 03:31:28 +00:00
Xiangyu/Malcolm Chen
80f2a9922a [automerger skipped] Merge "Don't show signal bar of hidden Cellular subscription." am: 2f2a4199fc am: d521104464
am: b4c8ebbef0 -s ours
am skip reason: change_id I646278c9ab4dd2f37083658a25ad38ad4f65d42f with SHA1 d2d400cb4c is in history

Change-Id: I9fe483a3070adc62f46194479eea05ff4f10ac19
2019-01-23 19:30:24 -08:00
Jack Yu
332b5b5786 Merge "Supported data handover in DcTracker/DataConnection/ApnContext" am: 56e1062ce3
am: e055bfa0fa

Change-Id: I3a16a4c3f846114948028d84b82eddb86d6a8d2c
2019-01-23 19:17:22 -08:00
Stanley Tng
38acb197cf Merge "Add Android APIs for Hearing Aids Profile" am: a53fc20213 am: 62a2308550
am: 31b70c2868

Change-Id: Iac7fe414ddc1fbc04e8bbe3c2e96d3d57d364995
2019-01-23 19:10:10 -08:00
Chen Xu
18aa5e76de Merge "add missing permission check in PhoneStateListener" am: feb7d14aa8
am: b102235018

Change-Id: Ic20401236b22b75d1afe38a49e2897473634e99f
2019-01-23 19:07:19 -08:00
TreeHugger Robot
96129fb7bb Merge "Fix another layout casting crash that happens sometimes" 2019-01-24 03:05:12 +00:00
Android Build Merger (Role)
5f73f44462 Merge "Merge "Add 2 new ways to check for Support for Hearing Aids Profile" am: 7982e6f346 am: c144c329ab am: 61c1afaa45" 2019-01-24 03:02:54 +00:00
TreeHugger Robot
ea9ae25528 Merge "Fix attr inheritShowWhenLocked cannot read from manifest." 2019-01-24 03:01:56 +00:00
Robert Shih
05875d3e98 Merge "MediaPlayer2: callback based DRM APIs implementation" 2019-01-24 03:01:40 +00:00
Stanley Tng
7b85a217b2 Merge "Add 2 new ways to check for Support for Hearing Aids Profile" am: 7982e6f346 am: c144c329ab
am: 61c1afaa45

Change-Id: Ib2808f47c6df08b68a35c4cc7da269e8fbf009d4
2019-01-23 19:01:19 -08:00
Xiangyu/Malcolm Chen
b4c8ebbef0 Merge "Don't show signal bar of hidden Cellular subscription." am: 2f2a4199fc
am: d521104464

Change-Id: I6b419270163b5fbfb72cc3a66d010782bd6eaf47
2019-01-23 18:54:46 -08:00
Christian Wailes
2d97aa8061 [automerger skipped] Merge "Refactored ZygoteConnection.Arguments to ZygoteArguments." am: 3a46c1b4ce am: 3926f08109
am: 80db7b7783 -s ours
am skip reason: change_id Ideb414c87a92020128a644147949ef4f4133ae33 with SHA1 2be2626aa6 is in history

Change-Id: I33b4bd5f8ff922a0ecb5cb1a1ba9dd827d2c8dd5
2019-01-23 18:53:26 -08:00
Jack Yu
e055bfa0fa Merge "Supported data handover in DcTracker/DataConnection/ApnContext"
am: 56e1062ce3

Change-Id: I46d4f4855ddb99af80a87de03116cb6aa0826a67
2019-01-23 18:48:53 -08:00
Stanley Tng
31b70c2868 Merge "Add Android APIs for Hearing Aids Profile" am: a53fc20213
am: 62a2308550

Change-Id: Id9eccff5eb088f8c2638f242ff1ec6260093c1d4
2019-01-23 18:46:08 -08:00
Christian Wailes
6bc46bdee1 [automerger skipped] Merge "Code cleanup in ZygoteInit." am: 889648df40 am: 6b7e35d216
am: a13898896c -s ours
am skip reason: change_id I0d348caa1d9ca2a4c1e32430e0eebdd91672e473 with SHA1 143f7cc78e is in history

Change-Id: I660cf1e2e818d62beece1db547926548baf35454
2019-01-23 18:44:41 -08:00
TreeHugger Robot
0e32dc9d01 Merge "Implementing app standby quotas for alarms" 2019-01-24 02:41:08 +00:00
Stanley Tng
61c1afaa45 Merge "Add 2 new ways to check for Support for Hearing Aids Profile" am: 7982e6f346
am: c144c329ab

Change-Id: If877f5b24f5201efa9448723be90d62f194bf2d6
2019-01-23 18:39:31 -08:00
Android Build Merger (Role)
938843a338 Merge "[automerger skipped] Merge "Code cleanup to conform to style guide / linter." am: f5ff8f0661 am: 420eec4f52 am: a1f14e0912 -s ours am skip reason: change_id I9274b32f1f606f29f6eb3a1e5068ca18f607afe7 with SHA1 efce929711 is in history" 2019-01-24 02:35:40 +00:00
Jack Yu
56e1062ce3 Merge "Supported data handover in DcTracker/DataConnection/ApnContext" 2019-01-24 02:35:14 +00:00
Christian Wailes
af5c6a9c36 [automerger skipped] Merge "Code cleanup to conform to style guide / linter." am: f5ff8f0661 am: 420eec4f52
am: a1f14e0912 -s ours
am skip reason: change_id I9274b32f1f606f29f6eb3a1e5068ca18f607afe7 with SHA1 efce929711 is in history

Change-Id: Iaf643792deeb6d0e7369daf1f85bc882a8028b99
2019-01-23 18:35:07 -08:00
Christian Wailes
80db7b7783 Merge "Refactored ZygoteConnection.Arguments to ZygoteArguments." am: 3a46c1b4ce
am: 3926f08109

Change-Id: I173c9cd671a9683793eee0c5053e3e8855ec0cf8
2019-01-23 18:34:18 -08:00
TreeHugger Robot
9e2eb49a78 Merge "Fix the window can't receive input still recevied events" 2019-01-24 02:33:49 +00:00
Christian Wailes
a13898896c Merge "Code cleanup in ZygoteInit." am: 889648df40
am: 6b7e35d216

Change-Id: I654fcdb478dfae98d78b0353e068122d115dd2c5
2019-01-23 18:28:46 -08:00
Christian Wailes
a1f14e0912 Merge "Code cleanup to conform to style guide / linter." am: f5ff8f0661
am: 420eec4f52

Change-Id: If4634a4d8026c1df1c581b120527926fbee68a0e
2019-01-23 18:23:25 -08:00
Chen Xu
b102235018 Merge "add missing permission check in PhoneStateListener"
am: feb7d14aa8

Change-Id: I7ccfab5789cd2adf654d6d593cec22f496a9a767
2019-01-23 18:22:29 -08:00
Xiangyu/Malcolm Chen
d521104464 Merge "Don't show signal bar of hidden Cellular subscription."
am: 2f2a4199fc

Change-Id: I3fa6a5b7baec94bd085a86fb4cce5062c5fd1a0f
2019-01-23 18:15:38 -08:00
Christian Wailes
15f7bb3c24 [automerger skipped] Merge "Implemented native functions and types for blastula management." am: 5222bf368b am: c5cc5e525c
am: 3f076da22b -s ours
am skip reason: change_id I12cd9f2c87a2e3c00d64b683edf3631e29a51551 with SHA1 aa1c962ded is in history

Change-Id: Id3408faeecfc203d89b6225790eceda530362fb3
2019-01-23 18:12:58 -08:00
Stanley Tng
62a2308550 Merge "Add Android APIs for Hearing Aids Profile"
am: a53fc20213

Change-Id: Ib91747b26a3fffbfe4a87377fde7cbc01f50d0c1
2019-01-23 18:09:19 -08:00
Android Build Merger (Role)
5719789248 Merge "[automerger skipped] Merge "Add the blastula pool sockets to the Zygote whitelist." am: e22f160c2e am: 068b86e943 am: 7a77e78ade -s ours am skip reason: change_id I1ff4bea0a2ea163bf9c1ccc0d80ffd5d04c49191 with SHA1 032293a197 is in history" 2019-01-24 02:05:36 +00:00
Chris Wailes
e1201953ab [automerger skipped] Merge "Add the blastula pool sockets to the Zygote whitelist." am: e22f160c2e am: 068b86e943
am: 7a77e78ade -s ours
am skip reason: change_id I1ff4bea0a2ea163bf9c1ccc0d80ffd5d04c49191 with SHA1 032293a197 is in history

Change-Id: I60250c407a2b493cab59d97d632e11c0784147fc
2019-01-23 18:03:52 -08:00
Stanley Tng
c144c329ab Merge "Add 2 new ways to check for Support for Hearing Aids Profile"
am: 7982e6f346

Change-Id: I81f18175e61d5c1d1b213d5a112a8c70621e0d07
2019-01-23 18:03:26 -08:00
Badhri Jagan Sridharan
7e60f8efe0 Merge changes from topic "117330206"
* changes:
  UsbContaminant dialog
  Add test commands to spoof presence of contaminants
  Contaminant detection notification
  Support USB V1.2 HAL
2019-01-24 02:03:20 +00:00
Chen Xu
feb7d14aa8 Merge "add missing permission check in PhoneStateListener" 2019-01-24 02:00:55 +00:00
Christian Wailes
3f076da22b Merge "Implemented native functions and types for blastula management." am: 5222bf368b
am: c5cc5e525c

Change-Id: I4eb03e2d0592aefa196be7f96687aa4f155c0022
2019-01-23 17:56:00 -08:00
Shuzhen Wang
ac1c15821c Merge "Camera: Add support for dynamic physical camera switch" 2019-01-24 01:55:20 +00:00
Christian Wailes
ae7deb63ba [automerger skipped] Merge "Added mitigation for b/122921367" am: 80c398b74c am: b9293d20d5
am: b8fb174ffa -s ours
am skip reason: change_id Id38a6ccabdcd0da02a53e76c47850e197016e781 with SHA1 eac7f4e15a is in history

Change-Id: I4542b392afd0b04e0923cf81c870419d549c810d
2019-01-23 17:52:47 -08:00
Christian Wailes
3926f08109 Merge "Refactored ZygoteConnection.Arguments to ZygoteArguments."
am: 3a46c1b4ce

Change-Id: Id702f32a15ad134b6d694d0fc53e1721094f78dd
2019-01-23 17:50:58 -08:00
Chris Wailes
7a77e78ade Merge "Add the blastula pool sockets to the Zygote whitelist." am: e22f160c2e
am: 068b86e943

Change-Id: I7d1cf2f705f72791b418125762251fc38b1ab079
2019-01-23 17:47:34 -08:00
Christian Wailes
6b7e35d216 Merge "Code cleanup in ZygoteInit."
am: 889648df40

Change-Id: I236f851fe38c16e5f0ad54d64b6ff81bcb090b9e
2019-01-23 17:46:44 -08:00
Xiangyu/Malcolm Chen
2f2a4199fc Merge "Don't show signal bar of hidden Cellular subscription." 2019-01-24 01:45:07 +00:00
Christian Wailes
420eec4f52 Merge "Code cleanup to conform to style guide / linter."
am: f5ff8f0661

Change-Id: If6c04c711b328c114d04ea8b4aa01414a715b7a2
2019-01-23 17:42:24 -08:00
Chris Wailes
46f435ce97 [automerger skipped] Merge "Removed false positives from the greylist." am: 5d33fe94e4 am: 5adc8fa3e0
am: b8f046ea4e -s ours
am skip reason: change_id I25022d976e7444489aad1aeb1ce6b05736233476 with SHA1 c7a9dcf351 is in history

Change-Id: I0af7ada9c0b75d9a72b42a3ebc7f43ac57a632db
2019-01-23 17:38:53 -08:00
Christian Wailes
c5cc5e525c Merge "Implemented native functions and types for blastula management."
am: 5222bf368b

Change-Id: I833eef9f333bd7b5bf552beebfdc7cc483aeec26
2019-01-23 17:38:23 -08:00
Christian Wailes
b8fb174ffa Merge "Added mitigation for b/122921367" am: 80c398b74c
am: b9293d20d5

Change-Id: I22cefdd83cc27dcf6ba32c568e808450121969d6
2019-01-23 17:37:57 -08:00