Ned Burns
fb963a7a22
Merge "Make FeatureFlags a singleton"
2019-10-18 14:55:42 +00:00
Eran Messeri
111dfdfdae
Merge "Documentation: Indicate DPM method does I/O"
2019-10-18 13:10:51 +00:00
TreeHugger Robot
1ea7ca442d
Merge "Fix grammatical error in DPM"
2019-10-18 12:45:48 +00:00
Roshan Pius
2cff702187
Merge "Create a filegroup for utilities used by wifi"
2019-10-18 12:00:45 +00:00
Eran Messeri
128703b70d
Documentation: Indicate DPM method does I/O
...
Document that the addPersistentPreferredActivity method does Disk I/O
and so should not be called on the main thread.
Bug: 142648455
Test: m docs
Change-Id: Iadf2ab82f4f573e53ff68cad0b981494acf6f9b6
2019-10-18 12:24:43 +01:00
TreeHugger Robot
cf4c6d01af
Merge "[wm]: System ui visibility policy for freeform windowing"
2019-10-18 10:51:10 +00:00
Stanislav Zholnin
6de445e0f2
Merge "Add logging of one time permissions to PermissionGrantRequestResultReported atom."
2019-10-18 09:02:17 +00:00
Alan Stokes
9aa75e1049
Merge "Remove cookie parameter from updateFlags*."
2019-10-18 08:35:57 +00:00
Alan Stokes
74ade957a4
Merge "Store CRCs as Integer rather than as hex strings."
2019-10-18 08:35:29 +00:00
Gavin Corkery
8b79ee70e9
Merge "Use userId and package installer name when committing rollbacks"
2019-10-18 07:08:15 +00:00
Felipe Leme
75597f63df
[automerger skipped] Merge "Dump isPrimaryUser() / isSplitSystemUser() on 'user' service." into qt-qpr1-dev am: bc06a47cd6
...
am: a61a261318d7b88384fe
2019-10-17 23:57:34 -07:00
Felipe Leme
a61a261318
Merge "Dump isPrimaryUser() / isSplitSystemUser() on 'user' service." into qt-qpr1-dev
...
am: bc06a47cd6
2019-10-17 23:50:37 -07:00
Felipe Leme
bc06a47cd6
Merge "Dump isPrimaryUser() / isSplitSystemUser() on 'user' service." into qt-qpr1-dev
2019-10-18 06:28:44 +00:00
Jimmy Chen
6e57d0032b
Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb am: 58d08de0c6 am: e21e19ec4d
...
am: e8d6c6ac04
2019-10-17 23:25:44 -07:00
Jimmy Chen
e8d6c6ac04
Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb am: 58d08de0c6
...
am: e21e19ec4d
2019-10-17 23:19:13 -07:00
Jimmy Chen
e21e19ec4d
Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb
...
am: 58d08de0c6
2019-10-17 23:12:30 -07:00
Jimmy Chen
58d08de0c6
Merge "p2p: mirgrate p2p into tethering modes"
...
am: 8a9a9adaeb
2019-10-17 23:06:04 -07:00
Nate Jiang
31654058d3
Merge "[WifiManager] add public API to register callback on scan result"
2019-10-18 05:55:47 +00:00
Jimmy Chen
8a9a9adaeb
Merge "p2p: mirgrate p2p into tethering modes"
2019-10-18 05:42:31 +00:00
Roshan Pius
09de13ed90
Create a filegroup for utilities used by wifi
...
These non-formal API utilities will be compiled into the wifi stack
APK & jar-jar'ed to avoid conflicting with the utilities present
on the system image.
Bug: 142809066
Test: Compiles & wifi stack can connect to networks.
Change-Id: Ie02f9c34fdf953ab9a0c1525b22ce267af9bcbd5
2019-10-17 22:19:07 -07:00
Aaron Huang
8adf1652b9
Merge "Expose MacAddress methods to public API" am: 7b98130570 am: 0688f9b6b1 am: c55e2d6d59
...
am: 93cc10ac81
2019-10-17 21:20:51 -07:00
Aaron Huang
93cc10ac81
Merge "Expose MacAddress methods to public API" am: 7b98130570 am: 0688f9b6b1
...
am: c55e2d6d59
2019-10-17 21:14:08 -07:00
Aaron Huang
c55e2d6d59
Merge "Expose MacAddress methods to public API" am: 7b98130570
...
am: 0688f9b6b1
2019-10-17 21:07:13 -07:00
Aaron Huang
0688f9b6b1
Merge "Expose MacAddress methods to public API"
...
am: 7b98130570
2019-10-17 20:55:36 -07:00
Aaron Huang
7b98130570
Merge "Expose MacAddress methods to public API"
2019-10-18 03:45:40 +00:00
TreeHugger Robot
6d04d658dc
Merge "Code cleanup: StagedRollbackTest (3/n)"
2019-10-18 03:38:09 +00:00
Philip P. Moltmann
c9bb90c0e0
Merge "Add feature context"
2019-10-18 02:26:08 +00:00
JW Wang
3bcb811cf6
Code cleanup: StagedRollbackTest (3/n)
...
Rename and group device methods together that belong to the same host
side method.
Bug: 142697546
Test: atest StagedRollbackTest
Change-Id: Iec49c141ef2b6c99c3a395c5287af562ee975942
2019-10-18 09:37:16 +08:00
Android Build Merger (Role)
291a46e4f4
Merge "[automerger skipped] Merge "Move JetPlayer implemention and JNI" am: 147d162e10 am: 256948b814 am: 5c31848594 am: ad2bc6a178 -s ours am skip reason: change_id I028c774fdea167924b064855267254c15f22fddb with SHA1 5ff1173ab1 is in history"
2019-10-18 01:13:53 +00:00
Marco Nelissen
4bab53bf97
[automerger skipped] Merge "Move JetPlayer implemention and JNI" am: 147d162e10 am: 256948b814 am: 5c31848594
...
am: ad2bc6a1785ff1173ab1
2019-10-17 18:12:46 -07:00
TreeHugger Robot
c0581181c8
Merge "Ensure #openTypedAssetFileDescriptor doesn't lose extras."
2019-10-18 01:11:23 +00:00
Louis Chang
95a5e431d2
Merge "Add public API for converting activity translucency"
2019-10-18 01:07:50 +00:00
Marco Nelissen
ad2bc6a178
Merge "Move JetPlayer implemention and JNI" am: 147d162e10 am: 256948b814
...
am: 5c31848594
2019-10-17 18:06:18 -07:00
Marco Nelissen
5c31848594
Merge "Move JetPlayer implemention and JNI" am: 147d162e10
...
am: 256948b814
2019-10-17 17:55:14 -07:00
Marco Nelissen
256948b814
Merge "Move JetPlayer implemention and JNI"
...
am: 147d162e10
2019-10-17 17:48:33 -07:00
TreeHugger Robot
9d95d01d37
Merge "Revert "Sync app ops for all runtime permissions in PermissionPolicyService.""
2019-10-18 00:32:37 +00:00
Marco Nelissen
147d162e10
Merge "Move JetPlayer implemention and JNI"
2019-10-18 00:28:31 +00:00
Ned Burns
8edaf50ede
Merge "Rename getters on NotificationEntry"
2019-10-18 00:24:50 +00:00
TreeHugger Robot
4f842f444c
Merge "Fix fingerprint listening delay when locking phone"
2019-10-17 23:47:03 +00:00
Jing Ji
0c69030d9d
Merge "OomAdjust Performance Improvement"
2019-10-17 23:20:40 +00:00
Shuo Qian
f5a5d65bc3
Merge "Emergency number database config updater"
2019-10-17 23:18:56 +00:00
Zhen Zhang
21fff1d68e
Merge "Add tests for min-heap sorting in Share-sheet"
2019-10-17 23:17:40 +00:00
Zhen Zhang
f52d443744
Merge "Refactor and override creation of the async sorting task"
2019-10-17 23:17:40 +00:00
Zhen Zhang
d45e024e7d
Merge "Create a method for top K targets by using min heap algorithm"
2019-10-17 23:17:40 +00:00
Varun Shah
840a9c4ea4
Ensure #openTypedAssetFileDescriptor doesn't lose extras.
...
ContentResolver#openTypedAssetFileDescripor was not passing extras from
the file descriptor when creating the AssetFileDescriptor. This ensures
the extras are passed along as well.
Fixes: 135510219
Test: atest ContentResolverTest
Test: atest ContentResolverWrapTest
Test: atest ContentProviderClientTest
Change-Id: I2a7ed6d1bf0bcd31feb632be5c84baeae15e7024
2019-10-17 16:12:42 -07:00
TreeHugger Robot
7780ab30db
Merge "Merge AppWindowToken into ActivityRecord"
2019-10-17 22:54:07 +00:00
Varun Shah
06d1d97980
Merge "Remove always-on logging."
2019-10-17 22:52:52 +00:00
Nate(Qiang) Jiang
ee434e8194
[WifiManager] add public API to register callback on scan result
...
Bug: 142680108
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: I370a972c166242d31d21672c9d8023258664968a
2019-10-17 15:48:06 -07:00
Christine Tsai
36cf72f375
Merge "Add comment for TimeUnit::ONE_MINUTE guardrail"
2019-10-17 22:15:19 +00:00
Ryan Mitchell
63f7f98ebb
Merge changes Ie349c56d,I5d5344cd
...
* changes:
Allow for RRO internal referencing
Idmap format changes for bidirectional lookup
2019-10-17 22:07:47 +00:00
