OSDN Git Service
Rafal Slawik [Tue, 16 Apr 2019 12:16:15 +0000 (13:16 +0100)]
Monitor swap
Pull value of VmSwap from /proc/PID/status when capturing
ProcessMemoryState atom.
Before change:
(average pull time nanos)
43355896
(max pull time nanos)
75649278
After change:
(average pull time nanos)
86307073
(max pull time nanos)
151681474
Delta: 2x increase
Pulling frequency is controled via westworld and we trade-off more
expensive reads for more actionable data (helping detect memory leaks).
Bug:
130624561
Test: atest MemoryStatUtilTest
Test: benchmark pulling ProcessMemoryState atom
Test: manually take a statsd report
Change-Id: I1d90563b70b5253b3d31ddab4810db870620c4d4
Michal Karpinski [Tue, 16 Apr 2019 10:20:53 +0000 (03:20 -0700)]
Merge "If the calling process isn't whitelisted for background activity start, check the other processes of calling UID too" into qt-dev am:
df573a6210
am:
fb7b65317a
Change-Id: I3a5e2bc3fc0f0a18c913917711e03b8c16e7efbd
Michal Karpinski [Tue, 16 Apr 2019 10:12:34 +0000 (03:12 -0700)]
Merge "If the calling process isn't whitelisted for background activity start, check the other processes of calling UID too" into qt-dev
am:
df573a6210
Change-Id: I9984a1d47c8316e972633c3b288bcda2718691ba
Orion Hodson [Tue, 16 Apr 2019 09:58:48 +0000 (09:58 +0000)]
Merge "Ensure all fields of AutoBufferPointer are initialized"
TreeHugger Robot [Tue, 16 Apr 2019 09:38:25 +0000 (09:38 +0000)]
Merge "If the calling process isn't whitelisted for background activity start, check the other processes of calling UID too" into qt-dev
Luke Huang [Tue, 16 Apr 2019 09:37:43 +0000 (02:37 -0700)]
Merge "Fix DnsResolver API could not bypass private DNS correctly" am:
40e7fb6a9b am:
7015572982
am:
51a5dab548
Change-Id: Ic9e078f8acf7688850dfe31f15ed065739ad5281
Luke Huang [Tue, 16 Apr 2019 09:27:28 +0000 (02:27 -0700)]
Merge "Fix DnsResolver API could not bypass private DNS correctly" am:
40e7fb6a9b
am:
7015572982
Change-Id: Ib2f8ae73e2a9d76d87243d53cac1157032156082
Luke Huang [Tue, 16 Apr 2019 09:17:09 +0000 (02:17 -0700)]
Merge "Fix DnsResolver API could not bypass private DNS correctly"
am:
40e7fb6a9b
Change-Id: Iaa36a882c2bcfd3bb11153d2b37cdab887ad9004
Luke Huang [Tue, 16 Apr 2019 09:03:22 +0000 (09:03 +0000)]
Merge "Fix DnsResolver API could not bypass private DNS correctly"
Tarandeep Singh [Tue, 16 Apr 2019 08:13:56 +0000 (01:13 -0700)]
Merge "Allow MSIME to set inactive when window loses focus." into qt-dev am:
77d354efa1
am:
32758ac767
Change-Id: Ia9255df8abf5abe7efe512f00bdc13d633fd501d
Tarandeep Singh [Tue, 16 Apr 2019 07:58:18 +0000 (00:58 -0700)]
Merge "Allow MSIME to set inactive when window loses focus." into qt-dev
am:
77d354efa1
Change-Id: Idca17e14657b6280af320529dc6ce8b23bc11c59
Tarandeep Singh [Tue, 16 Apr 2019 07:37:06 +0000 (07:37 +0000)]
Merge "Allow MSIME to set inactive when window loses focus." into qt-dev
Jin Seok Park [Tue, 16 Apr 2019 07:17:38 +0000 (00:17 -0700)]
Merge "Rename Session2Command methods" into qt-dev am:
b225cffabe
am:
ef68908ed4
Change-Id: I6504f492d1ab5f0e6f71ae81f8c8ae116619968d
Jin Seok Park [Tue, 16 Apr 2019 07:04:47 +0000 (00:04 -0700)]
Merge "Rename Session2Command methods" into qt-dev
am:
b225cffabe
Change-Id: Ia4c7138d57b341af7b0c315b8950a6b6729297dc
Riddle Hsu [Tue, 16 Apr 2019 07:04:33 +0000 (00:04 -0700)]
Merge "Defer top process state for VM" into qt-dev am:
e6b9bdf4d0
am:
8c6263c0ea
Change-Id: Ic6e81d171a4e1832d7f3d045d7e37af13608a1a3
Riddle Hsu [Tue, 16 Apr 2019 06:55:45 +0000 (23:55 -0700)]
Merge "Defer top process state for VM" into qt-dev
am:
e6b9bdf4d0
Change-Id: I1d9d698345e1c53ea9f9c96fb49130d0b040f4b9
Jin Seok Park [Tue, 16 Apr 2019 06:47:18 +0000 (06:47 +0000)]
Merge "Rename Session2Command methods" into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 06:37:50 +0000 (06:37 +0000)]
Merge "Defer top process state for VM" into qt-dev
Sean Stout [Tue, 16 Apr 2019 06:26:17 +0000 (23:26 -0700)]
Merge "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API" into qt-dev am:
a0d852907d
am:
4e56a0e44a
Change-Id: Ib62bcd24790943ad0724106a4dcea5afbc837fdd
Sean Stout [Tue, 16 Apr 2019 06:13:16 +0000 (23:13 -0700)]
Merge "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API" into qt-dev
am:
a0d852907d
Change-Id: Id698778342efb7e523fcfc63e41b86e5c7a397b4
Chalard Jean [Tue, 16 Apr 2019 06:08:09 +0000 (23:08 -0700)]
Merge "Restrict access to dangerous methods to <= P" am:
ae8548df0b am:
4115d2c4f9
am:
6eaf97ecd6
Change-Id: I890030580fdad45c3f8589bf6adbe5798d578cfe
Junyu Lai [Tue, 16 Apr 2019 06:00:02 +0000 (23:00 -0700)]
Merge "Release keepalive slot after stopped" am:
a1fedb8f5c am:
62c5c61718
am:
77f60bd4f6
Change-Id: I790f6bbc5efc3f088034ac45ec379da5f781d0ca
Sean Stout [Tue, 16 Apr 2019 05:50:30 +0000 (05:50 +0000)]
Merge "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API" into qt-dev
Kevin Chyn [Tue, 16 Apr 2019 05:49:14 +0000 (22:49 -0700)]
Merge "Cache and log enrollment settings" into qt-dev am:
12154d85a4
am:
3dbb8c47d6
Change-Id: I723b5888d80ff89d51db71064f79de99e618fcd0
Chalard Jean [Tue, 16 Apr 2019 05:39:08 +0000 (22:39 -0700)]
Merge "Restrict access to dangerous methods to <= P" am:
ae8548df0b
am:
4115d2c4f9
Change-Id: I95107f7b628eecb54e9f4411785186b668e9f3d8
Jeff Sharkey [Tue, 16 Apr 2019 05:34:54 +0000 (22:34 -0700)]
Merge "Allow failures of applyBatch() operations." into qt-dev am:
977f63a3d3
am:
b7074791f4
Change-Id: I9d469796eacab89787110a4f0d98213fb797f5d9
Chalard Jean [Tue, 16 Apr 2019 05:29:28 +0000 (22:29 -0700)]
Merge "Restrict access to dangerous methods to <= P"
am:
ae8548df0b
Change-Id: I3c1271e00e026518e9c4ddafc931a2cac87dcee0
Sungsoo Lim [Tue, 16 Apr 2019 05:19:03 +0000 (22:19 -0700)]
Merge "Remove MediaItem2" into qt-dev am:
4e57ccbea9
am:
36669f72d9
Change-Id: If17653d534eec4e79f1b07d6f8afac01629fd454
Chalard Jean [Tue, 16 Apr 2019 05:17:20 +0000 (05:17 +0000)]
Merge "Restrict access to dangerous methods to <= P"
Junyu Lai [Tue, 16 Apr 2019 05:16:02 +0000 (22:16 -0700)]
Merge "Release keepalive slot after stopped" am:
a1fedb8f5c
am:
62c5c61718
Change-Id: I8bf18f5dd10412f251071cea8140793b22c7fd95
Jackal Guo [Tue, 16 Apr 2019 05:13:31 +0000 (22:13 -0700)]
[automerger skipped] Merge "Don't cancel injected event when mouse event arrives" into qt-dev am:
93e21670c0
am:
67880a7d60 -s ours
am skip reason: change_id I2c2be8cf565ba15d1a9cd6bc8c45b695c1309b56 with SHA1
e95df8aecb is in history
Change-Id: Ie5bd13e3762ffc5e6ae0cbad5303921b5a049e1c
NT Tsai [Tue, 16 Apr 2019 05:08:17 +0000 (22:08 -0700)]
Merge "Fix a deadlock WMG->WMS, WMS->WMG" into qt-dev am:
4d39c62169
am:
26fe74b302
Change-Id: I9aa3ac2f7659e02a59e8852bbb576d935674e032
Kevin Chyn [Tue, 16 Apr 2019 05:06:14 +0000 (22:06 -0700)]
Merge "Cache and log enrollment settings" into qt-dev
am:
12154d85a4
Change-Id: I4250e6d6511a2d1726740f93c3d351727d5b1f78
Junyu Lai [Tue, 16 Apr 2019 05:04:18 +0000 (22:04 -0700)]
Merge "Release keepalive slot after stopped"
am:
a1fedb8f5c
Change-Id: Ic707f22fb12c98c187e89cc8ad39773f61737506
Winson Chung [Tue, 16 Apr 2019 05:03:01 +0000 (22:03 -0700)]
Merge "Don't wait until next fetch of recent tasks to reset the task list" into qt-dev am:
8540e63dec
am:
cc12b2256c
Change-Id: Iaf56cb15841a4b0a3ce042f97d484f83b8f392cd
Louis Chang [Tue, 16 Apr 2019 04:55:26 +0000 (21:55 -0700)]
Merge "Log for pending activities launch" into qt-dev am:
0727797765
am:
2e03e241ca
Change-Id: I1157ec56b598f57ca2eeb66b6aa2fe0db500c97a
jiayuzhou [Tue, 16 Apr 2019 04:46:33 +0000 (21:46 -0700)]
Merge "Ui should be UI in the javadoc" into qt-dev am:
805c739ada
am:
5272b7d69d
Change-Id: Iee918715c4ecbbc0dabe8905ad317d22d8e91552
Junyu Lai [Tue, 16 Apr 2019 04:46:18 +0000 (04:46 +0000)]
Merge "Release keepalive slot after stopped"
Kevin Chyn [Tue, 16 Apr 2019 04:43:32 +0000 (04:43 +0000)]
Merge "Cache and log enrollment settings" into qt-dev
Jin Seok Park [Tue, 16 Apr 2019 01:35:14 +0000 (10:35 +0900)]
Rename Session2Command methods
Bug:
130580655
Test: atest CtsMediaTestCases:android.media.cts.Session2CommandTest
Change-Id: I89509ddc1b10d47a01f7227ae60c5529718d39de
Luke Huang [Tue, 16 Apr 2019 03:50:15 +0000 (11:50 +0800)]
Fix DnsResolver API could not bypass private DNS correctly
Bug:
130594022
Test: atest DnsResolverTest
Change-Id: Ibf3edac3075d921d189237c485871efb869b320b
Jeff Sharkey [Tue, 16 Apr 2019 03:54:03 +0000 (20:54 -0700)]
Merge "Allow failures of applyBatch() operations." into qt-dev
am:
977f63a3d3
Change-Id: I5e0099c01cd5fdfacdb4b1bf1f46e3d13dbf9061
Amin Shaikh [Tue, 16 Apr 2019 03:53:58 +0000 (20:53 -0700)]
Merge "Restore navbar transparency state on config change" into qt-dev am:
0c7f7a1ee6
am:
4ee485afc1
Change-Id: I671bd01d637e694e7ccb0e819ef0f6ce820f98ca
Sungsoo Lim [Tue, 16 Apr 2019 03:38:59 +0000 (20:38 -0700)]
Merge "Remove MediaItem2" into qt-dev
am:
4e57ccbea9
Change-Id: I73ba96b5a48dab7a6cc4a428739368034fe334c8
Hall Liu [Tue, 16 Apr 2019 03:27:17 +0000 (20:27 -0700)]
Merge "Add EHPLMN and HPLMN to SubscriptionInfo" into qt-dev am:
80ad2a4d8c
am:
38023586fc
Change-Id: I086195b7863e8a4dfe6bad5eacede6d8f540d851
Jeff Sharkey [Tue, 16 Apr 2019 03:26:18 +0000 (03:26 +0000)]
Merge "Allow failures of applyBatch() operations." into qt-dev
Jackal Guo [Tue, 16 Apr 2019 03:21:17 +0000 (20:21 -0700)]
Merge "Don't cancel injected event when mouse event arrives" into qt-dev
am:
93e21670c0
Change-Id: I396ed7132dee15b0db649a303d85322e774f7f37
Alex Salo [Tue, 16 Apr 2019 03:20:59 +0000 (20:20 -0700)]
Merge "Remove the disableSelf() api" into qt-dev am:
575022f7d1
am:
f9a18241ac
Change-Id: I36cb46bade077fc26d7a78e0a75c5749bd9ea2b4
NT Tsai [Tue, 16 Apr 2019 03:15:13 +0000 (20:15 -0700)]
Merge "Fix a deadlock WMG->WMS, WMS->WMG" into qt-dev
am:
4d39c62169
Change-Id: I91741e19a580b65ab860cf96fe6b1fd14590babb
TreeHugger Robot [Tue, 16 Apr 2019 03:14:29 +0000 (03:14 +0000)]
Merge "Remove MediaItem2" into qt-dev
Matt Pape [Tue, 16 Apr 2019 03:12:22 +0000 (20:12 -0700)]
Merge "Annotate single property listener from DeviceConfig as removed. Will remove entirely after all references (esp. Play Services) are cleaned up." into qt-dev am:
75d75ce38c
am:
4413b8c6a6
Change-Id: If2067fd426825b997f27997e1bbdf1b52dd190e0
Winson Chung [Tue, 16 Apr 2019 03:07:48 +0000 (20:07 -0700)]
Merge "Don't wait until next fetch of recent tasks to reset the task list" into qt-dev
am:
8540e63dec
Change-Id: I20b2ee78bf853a9e070862fd32a51324985dd277
Mehdi Alizadeh [Tue, 16 Apr 2019 02:58:31 +0000 (19:58 -0700)]
Merge "Add new constructors for mandatory fields in AppTarget.Builder" into qt-dev am:
6164eb6a8d
am:
dd0ce3a2fb
Change-Id: I8550a65bc74ee4d9dd090daf997a6067e3341653
TreeHugger Robot [Tue, 16 Apr 2019 02:50:09 +0000 (02:50 +0000)]
Merge "Don't cancel injected event when mouse event arrives" into qt-dev
Louis Chang [Tue, 16 Apr 2019 02:47:08 +0000 (19:47 -0700)]
Merge "Log for pending activities launch" into qt-dev
am:
0727797765
Change-Id: I4d9eccfbf005ff117b3148918e5a4252ad00ebc1
jiayuzhou [Tue, 16 Apr 2019 02:35:53 +0000 (19:35 -0700)]
Merge "Ui should be UI in the javadoc" into qt-dev
am:
805c739ada
Change-Id: I467070af9f43a0d03ca64e4c5491aca548f9cd3d
Tony Mak [Tue, 16 Apr 2019 02:33:39 +0000 (19:33 -0700)]
Merge "Add missing set/getExtras to ConversationActions.Request." into qt-dev am:
786714e526
am:
b9eda81d08
Change-Id: Id8a7a71c95180d293b167f987bfc3176cf4263e3
Ying Zheng [Tue, 16 Apr 2019 02:27:17 +0000 (19:27 -0700)]
Merge "Migrate to the new ro property for headless multiuser check." into qt-dev am:
5d230c1462
am:
6547071268
Change-Id: Ib1e325c8f0baa19f13df22d40d49112b7126d356
NT Tsai [Tue, 16 Apr 2019 02:27:02 +0000 (02:27 +0000)]
Merge "Fix a deadlock WMG->WMS, WMS->WMG" into qt-dev
Amin Shaikh [Tue, 16 Apr 2019 02:26:33 +0000 (19:26 -0700)]
Merge "Restore navbar transparency state on config change" into qt-dev
am:
0c7f7a1ee6
Change-Id: I94d630ac80e7f763ccc3aa7494c827245006c183
Ryan Mitchell [Tue, 16 Apr 2019 02:14:34 +0000 (19:14 -0700)]
Merge changes I06a74c84,I2cf9d3aa into qt-dev am:
e20c7dff81
am:
59168601df
Change-Id: I0a1729f86680f7af2645f821ff3e22f252d485e1
Winson Chung [Tue, 16 Apr 2019 02:13:58 +0000 (02:13 +0000)]
Merge "Don't wait until next fetch of recent tasks to reset the task list" into qt-dev
Hall Liu [Tue, 16 Apr 2019 02:08:31 +0000 (19:08 -0700)]
Merge "Add EHPLMN and HPLMN to SubscriptionInfo" into qt-dev
am:
80ad2a4d8c
Change-Id: I4e3e0fc86a2efec165cb55f650d0840e6c7a4634
Winson Chung [Tue, 16 Apr 2019 02:04:44 +0000 (19:04 -0700)]
Merge "Add nullable annotations" into qt-dev am:
4b118856db
am:
4259c81de7
Change-Id: I07b08ebeeb1ce0a7dd001885a653c13b813a38f3
Alex Salo [Tue, 16 Apr 2019 01:58:43 +0000 (18:58 -0700)]
Merge "Remove the disableSelf() api" into qt-dev
am:
575022f7d1
Change-Id: I71cf19838c533db9b9589eadb25191638f2d4691
Xiangyu/Malcolm Chen [Tue, 16 Apr 2019 01:51:12 +0000 (18:51 -0700)]
[automerger skipped] Merge "Add comments in grouping APIs to clarify possible exceptions." am:
42adca41b9 am:
7aacd1081d -s ours
am:
99797108c3 -s ours
am skip reason: change_id I3671e366be7e8c3a75b5ee23b7cf88a33ecd3a4f with SHA1
e00887f612 is in history
Change-Id: I5897cd62091635123d2384e8093c6ad8843ea225
TreeHugger Robot [Tue, 16 Apr 2019 01:41:41 +0000 (01:41 +0000)]
Merge "Log for pending activities launch" into qt-dev
Felipe Leme [Tue, 16 Apr 2019 01:40:21 +0000 (18:40 -0700)]
[automerger skipped] Merge "Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev am:
11141109f4" into qt-dev-plus-aosp
am:
2fad0b644f -s ours
am skip reason: subject contains skip directive
Change-Id: Id67ed9fc43bae413f31a566f5a66d9c0e8db6b0d
Matt Pape [Tue, 16 Apr 2019 01:38:40 +0000 (18:38 -0700)]
Merge "Annotate single property listener from DeviceConfig as removed. Will remove entirely after all references (esp. Play Services) are cleaned up." into qt-dev
am:
75d75ce38c
Change-Id: Ib028070316bab080732ddbfb08fde7a05667f8ab
Felipe Leme [Tue, 16 Apr 2019 01:27:58 +0000 (18:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev am:
11141109f4
am:
3e7ebd525b -s ours
am skip reason: subject contains skip directive
Change-Id: I8f2ce98e42a9c36575b21b8a02dfbebcfc5419a1
Mehdi Alizadeh [Tue, 16 Apr 2019 01:25:56 +0000 (18:25 -0700)]
Merge "Add new constructors for mandatory fields in AppTarget.Builder" into qt-dev
am:
6164eb6a8d
Change-Id: I535228d810100d28ae20395b324aa7d0e042780b
Android Build Merger (Role) [Tue, 16 Apr 2019 01:25:08 +0000 (01:25 +0000)]
Merge "Merge "Add EHPLMN and HPLMN to SubscriptionInfo" am:
4d6ce5406a am:
dc86ce9ae5 am:
843c03879f"
Hall Liu [Tue, 16 Apr 2019 01:22:59 +0000 (18:22 -0700)]
Merge "Add EHPLMN and HPLMN to SubscriptionInfo" am:
4d6ce5406a am:
dc86ce9ae5
am:
843c03879f
Change-Id: If05b6646a070a3e4b288ddf941daa3b8f468e1c7
TreeHugger Robot [Tue, 16 Apr 2019 01:20:23 +0000 (01:20 +0000)]
Merge "Passpoint: add NETWORK_CARRIER_PROVISIONING for removePasspointConfigurations"
TreeHugger Robot [Tue, 16 Apr 2019 01:20:05 +0000 (01:20 +0000)]
Merge "Ui should be UI in the javadoc" into qt-dev
Tony Mak [Tue, 16 Apr 2019 01:12:55 +0000 (18:12 -0700)]
Merge "Add missing set/getExtras to ConversationActions.Request." into qt-dev
am:
786714e526
Change-Id: I0e70aba7a8a4dfc9192ee3f9e4559f2eaa1509eb
TreeHugger Robot [Tue, 16 Apr 2019 01:11:23 +0000 (01:11 +0000)]
Merge "Restore navbar transparency state on config change" into qt-dev
Harry Slatyer [Tue, 16 Apr 2019 01:10:27 +0000 (18:10 -0700)]
Merge "Add DENSITY_140, DENSITY_180, DENSITY_200, DENSITY_220" into qt-dev am:
151f5b2ec8
am:
0786074f6b
Change-Id: Iac4bf3bf40ffcf4648710d837b1f1cabf06c4e6e
Ying Zheng [Tue, 16 Apr 2019 01:05:00 +0000 (18:05 -0700)]
Merge "Migrate to the new ro property for headless multiuser check." into qt-dev
am:
5d230c1462
Change-Id: Ieecb5a6f48643244cd10777d716fd45287310f26
Hall Liu [Tue, 16 Apr 2019 01:01:59 +0000 (01:01 +0000)]
Merge "Add EHPLMN and HPLMN to SubscriptionInfo" into qt-dev
Shuo Qian [Tue, 16 Apr 2019 00:59:48 +0000 (17:59 -0700)]
[automerger skipped] Merge "Fix Emergency Number API doc" am:
3d50a3df6d am:
06a361bb5f -s ours
am:
9b8835363c -s ours
am skip reason: change_id I4c9b682ef25378b9de91cd6255ed6fc514ea220d with SHA1
aca6eb7dac is in history
Change-Id: I918c6a21a7cf22394f95de7ba62fa1f42113d74d
Ryan Mitchell [Tue, 16 Apr 2019 00:59:30 +0000 (17:59 -0700)]
Merge changes I06a74c84,I2cf9d3aa into qt-dev
am:
e20c7dff81
Change-Id: Id50e9217a08de6988168e73c82d7b23708172594
Jeff Sharkey [Tue, 16 Apr 2019 00:54:58 +0000 (18:54 -0600)]
Allow failures of applyBatch() operations.
In some cases, the supplier of ContentProviderOperation is okay
if certain operations fail, and they'd like ContentProviderResult
to tell them about the failures instead of aborting the remainder
of the transaction.
Start using this for ModernMediaScanner, where we probably raced
with someone when building an UPSERT-style operation. We'll
pick up any changes to those files during the next scan.
Bug:
128494336
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ida8230ff2bbb3bab56eb83928e49e7097bfbc9fd
Winson Chung [Tue, 16 Apr 2019 00:53:16 +0000 (17:53 -0700)]
Merge "Add nullable annotations" into qt-dev
am:
4b118856db
Change-Id: I6d7ee685a2ef3e8d94d0af0c97a45ab730a0da02
TreeHugger Robot [Tue, 16 Apr 2019 00:49:21 +0000 (00:49 +0000)]
Merge "Remove the disableSelf() api" into qt-dev
Xiangyu/Malcolm Chen [Tue, 16 Apr 2019 00:39:27 +0000 (17:39 -0700)]
[automerger skipped] Merge "Add comments in grouping APIs to clarify possible exceptions." am:
42adca41b9
am:
7aacd1081d -s ours
am skip reason: change_id I3671e366be7e8c3a75b5ee23b7cf88a33ecd3a4f with SHA1
e00887f612 is in history
Change-Id: Ib4f1629b1072cc4af736a1c15a8d5faac72f0ce8
Matt Pape [Tue, 16 Apr 2019 00:34:31 +0000 (00:34 +0000)]
Merge "Annotate single property listener from DeviceConfig as removed. Will remove entirely after all references (esp. Play Services) are cleaned up." into qt-dev
Mehdi Alizadeh [Tue, 16 Apr 2019 00:34:13 +0000 (00:34 +0000)]
Merge "Add new constructors for mandatory fields in AppTarget.Builder" into qt-dev
Sungsoo Lim [Tue, 16 Apr 2019 00:21:56 +0000 (09:21 +0900)]
Remove MediaItem2
Bug:
130579223
Test: build
Change-Id: Ie772b508b51a12eb4e96f1f19c08ecdec4a9959b
Riddle Hsu [Tue, 16 Apr 2019 00:21:22 +0000 (17:21 -0700)]
[automerger skipped] Merge "Get new surface if it was released from setWindowStopped" am:
90424e8060 am:
b1b6baee3a -s ours
am:
20bed88521 -s ours
am skip reason: change_id I2324ed32980aae5a3ec2efbd612e6c143c9a0022 with SHA1
af2748b28c is in history
Change-Id: I20c58648d84ecfc5b761f04bfdffe00205d02fae
Android Build Merger (Role) [Tue, 16 Apr 2019 00:20:29 +0000 (00:20 +0000)]
Merge "Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev am:
11141109f4" into qt-dev-plus-aosp
Felipe Leme [Tue, 16 Apr 2019 00:19:21 +0000 (17:19 -0700)]
Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev
am:
11141109f4
Change-Id: I096edc57c27211e1365e397d8782fba6637fe1ad
TreeHugger Robot [Tue, 16 Apr 2019 00:17:10 +0000 (00:17 +0000)]
Merge "Add missing set/getExtras to ConversationActions.Request." into qt-dev
Sean Stout [Mon, 15 Apr 2019 18:17:43 +0000 (11:17 -0700)]
Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API
Test: cts-tradefed run cts -m CtsSystemIntentTestCases -t \
android.systemintents.cts.TestSystemIntents
Bug:
129901520
Change-Id: I710867f6d6fffb86d7f3991f39bde4bf9d62e5f7
Xiangyu/Malcolm Chen [Tue, 16 Apr 2019 00:13:31 +0000 (17:13 -0700)]
Merge "Add comments in grouping APIs to clarify possible exceptions."
am:
42adca41b9
Change-Id: I6dd991c9e77cdaa8a295e31d382086327d168b21
Hall Liu [Tue, 16 Apr 2019 00:12:58 +0000 (17:12 -0700)]
Merge "Add EHPLMN and HPLMN to SubscriptionInfo" am:
4d6ce5406a
am:
dc86ce9ae5
Change-Id: Ia7e6ffa48ea302d23df9efa24ce485c5d50d59c0
Kevin Chyn [Tue, 16 Apr 2019 00:12:09 +0000 (17:12 -0700)]
Merge "Add logging for KeyguardUpdateMonitor visibility and biometric state" into qt-dev am:
fab88a833e
am:
14e7742069
Change-Id: I75a7a607a84c22ef665268e878ff79e3ae86117e
TreeHugger Robot [Tue, 16 Apr 2019 00:06:38 +0000 (00:06 +0000)]
Merge "Migrate to the new ro property for headless multiuser check." into qt-dev
TreeHugger Robot [Tue, 16 Apr 2019 00:06:21 +0000 (00:06 +0000)]
Merge changes I06a74c84,I2cf9d3aa into qt-dev
* changes:
Do not fail idmap scan if one idmap fails to generate
Run idmap2 static-checks and fix formatting issues
Winson Chung [Mon, 15 Apr 2019 23:57:01 +0000 (23:57 +0000)]
Merge "Add nullable annotations" into qt-dev
OSDN Git Service
