Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
414,805 Commits 3 Branches 0 Tags
b7074791f4e558cf7520a17f9218bffe96098193
Commit Graph

414805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
b7074791f4 Merge "Allow failures of applyBatch() operations." into qt-dev 
am: 977f63a3d3

Change-Id: I5e0099c01cd5fdfacdb4b1bf1f46e3d13dbf9061
 2019-04-15 20:54:03 -07:00
Sungsoo Lim
36669f72d9 Merge "Remove MediaItem2" into qt-dev 
am: 4e57ccbea9

Change-Id: I73ba96b5a48dab7a6cc4a428739368034fe334c8
 2019-04-15 20:38:59 -07:00
Jeff Sharkey
977f63a3d3 Merge "Allow failures of applyBatch() operations." into qt-dev 2019-04-16 03:26:18 +00:00
Jackal Guo
67880a7d60 Merge "Don't cancel injected event when mouse event arrives" into qt-dev 
am: 93e21670c0

Change-Id: I396ed7132dee15b0db649a303d85322e774f7f37
 2019-04-15 20:21:17 -07:00
NT Tsai
26fe74b302 Merge "Fix a deadlock WMG->WMS, WMS->WMG" into qt-dev 
am: 4d39c62169

Change-Id: I91741e19a580b65ab860cf96fe6b1fd14590babb
 2019-04-15 20:15:13 -07:00
TreeHugger Robot
4e57ccbea9 Merge "Remove MediaItem2" into qt-dev 2019-04-16 03:14:29 +00:00
Winson Chung
cc12b2256c Merge "Don't wait until next fetch of recent tasks to reset the task list" into qt-dev 
am: 8540e63dec

Change-Id: I20b2ee78bf853a9e070862fd32a51324985dd277
 2019-04-15 20:07:48 -07:00
TreeHugger Robot
93e21670c0 Merge "Don't cancel injected event when mouse event arrives" into qt-dev 2019-04-16 02:50:09 +00:00
Louis Chang
2e03e241ca Merge "Log for pending activities launch" into qt-dev 
am: 0727797765

Change-Id: I4d9eccfbf005ff117b3148918e5a4252ad00ebc1
 2019-04-15 19:47:08 -07:00
jiayuzhou
5272b7d69d Merge "Ui should be UI in the javadoc" into qt-dev 
am: 805c739ada

Change-Id: I467070af9f43a0d03ca64e4c5491aca548f9cd3d
 2019-04-15 19:35:53 -07:00
NT Tsai
4d39c62169 Merge "Fix a deadlock WMG->WMS, WMS->WMG" into qt-dev 2019-04-16 02:27:02 +00:00
Amin Shaikh
4ee485afc1 Merge "Restore navbar transparency state on config change" into qt-dev 
am: 0c7f7a1ee6

Change-Id: I94d630ac80e7f763ccc3aa7494c827245006c183
 2019-04-15 19:26:33 -07:00
Winson Chung
8540e63dec Merge "Don't wait until next fetch of recent tasks to reset the task list" into qt-dev 2019-04-16 02:13:58 +00:00
Hall Liu
38023586fc Merge "Add EHPLMN and HPLMN to SubscriptionInfo" into qt-dev 
am: 80ad2a4d8c

Change-Id: I4e3e0fc86a2efec165cb55f650d0840e6c7a4634
 2019-04-15 19:08:31 -07:00
Alex Salo
f9a18241ac Merge "Remove the disableSelf() api" into qt-dev 
am: 575022f7d1

Change-Id: I71cf19838c533db9b9589eadb25191638f2d4691
 2019-04-15 18:58:43 -07:00
TreeHugger Robot
0727797765 Merge "Log for pending activities launch" into qt-dev 2019-04-16 01:41:41 +00:00
Matt Pape
4413b8c6a6 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
 2019-04-15 18:38:40 -07:00
Mehdi Alizadeh
dd0ce3a2fb Merge "Add new constructors for mandatory fields in AppTarget.Builder" into qt-dev 
am: 6164eb6a8d

Change-Id: I535228d810100d28ae20395b324aa7d0e042780b
 2019-04-15 18:25:56 -07:00
TreeHugger Robot
805c739ada Merge "Ui should be UI in the javadoc" into qt-dev 2019-04-16 01:20:05 +00:00
Tony Mak
b9eda81d08 Merge "Add missing set/getExtras to ConversationActions.Request." into qt-dev 
am: 786714e526

Change-Id: I0e70aba7a8a4dfc9192ee3f9e4559f2eaa1509eb
 2019-04-15 18:12:55 -07:00
TreeHugger Robot
0c7f7a1ee6 Merge "Restore navbar transparency state on config change" into qt-dev 2019-04-16 01:11:23 +00:00
Ying Zheng
6547071268 Merge "Migrate to the new ro property for headless multiuser check." into qt-dev 
am: 5d230c1462

Change-Id: Ieecb5a6f48643244cd10777d716fd45287310f26
 2019-04-15 18:05:00 -07:00
Hall Liu
80ad2a4d8c Merge "Add EHPLMN and HPLMN to SubscriptionInfo" into qt-dev 2019-04-16 01:01:59 +00:00
Ryan Mitchell
59168601df Merge changes I06a74c84,I2cf9d3aa into qt-dev 
am: e20c7dff81

Change-Id: Id50e9217a08de6988168e73c82d7b23708172594
 2019-04-15 17:59:30 -07:00
Jeff Sharkey
295ddbae78 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
 2019-04-15 18:55:00 -06:00
Winson Chung
4259c81de7 Merge "Add nullable annotations" into qt-dev 
am: 4b118856db

Change-Id: I6d7ee685a2ef3e8d94d0af0c97a45ab730a0da02
 2019-04-15 17:53:16 -07:00
TreeHugger Robot
575022f7d1 Merge "Remove the disableSelf() api" into qt-dev 2019-04-16 00:49:21 +00:00
Xiangyu/Malcolm Chen
99797108c3 [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
 2019-04-15 17:39:27 -07:00
Matt Pape
75d75ce38c Merge "Annotate single property listener from DeviceConfig as removed. Will remove entirely after all references (esp. Play Services) are cleaned up." into qt-dev 2019-04-16 00:34:31 +00:00
Mehdi Alizadeh
6164eb6a8d Merge "Add new constructors for mandatory fields in AppTarget.Builder" into qt-dev 2019-04-16 00:34:13 +00:00
Sungsoo Lim
5562ab8966 Remove MediaItem2 
Bug: 130579223
Test: build
Change-Id: Ie772b508b51a12eb4e96f1f19c08ecdec4a9959b
 2019-04-16 09:28:11 +09:00
Android Build Merger (Role)
2fad0b644f Merge "Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev am: 11141109f4" into qt-dev-plus-aosp 2019-04-16 00:20:29 +00:00
Felipe Leme
3e7ebd525b Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev 
am: 11141109f4

Change-Id: I096edc57c27211e1365e397d8782fba6637fe1ad
 2019-04-15 17:19:21 -07:00
TreeHugger Robot
786714e526 Merge "Add missing set/getExtras to ConversationActions.Request." into qt-dev 2019-04-16 00:17:10 +00:00
Xiangyu/Malcolm Chen
7aacd1081d Merge "Add comments in grouping APIs to clarify possible exceptions." 
am: 42adca41b9

Change-Id: I6dd991c9e77cdaa8a295e31d382086327d168b21
 2019-04-15 17:13:31 -07:00
Hall Liu
843c03879f Merge "Add EHPLMN and HPLMN to SubscriptionInfo" am: 4d6ce5406a 
am: dc86ce9ae5

Change-Id: Ia7e6ffa48ea302d23df9efa24ce485c5d50d59c0
 2019-04-15 17:12:58 -07:00
TreeHugger Robot
5d230c1462 Merge "Migrate to the new ro property for headless multiuser check." into qt-dev 2019-04-16 00:06:38 +00:00
TreeHugger Robot
e20c7dff81 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
 2019-04-16 00:06:21 +00:00
Winson Chung
4b118856db Merge "Add nullable annotations" into qt-dev 2019-04-15 23:57:01 +00:00
Harry Slatyer
0786074f6b Merge "Add DENSITY_140, DENSITY_180, DENSITY_200, DENSITY_220" into qt-dev 
am: 151f5b2ec8

Change-Id: I2e3aa5e7d34a89af2090f0cd55a51ad2e439ab61
 2019-04-15 16:55:33 -07:00
Xiangyu/Malcolm Chen
42adca41b9 Merge "Add comments in grouping APIs to clarify possible exceptions." 2019-04-15 23:47:41 +00:00
TreeHugger Robot
11141109f4 Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev 2019-04-15 23:42:14 +00:00
Hall Liu
dc86ce9ae5 Merge "Add EHPLMN and HPLMN to SubscriptionInfo" 
am: 4d6ce5406a

Change-Id: I0713d5321bb7baf2a7e35cef9fbec0ae85790711
 2019-04-15 16:39:25 -07:00
Harry Slatyer
151f5b2ec8 Merge "Add DENSITY_140, DENSITY_180, DENSITY_200, DENSITY_220" into qt-dev 2019-04-15 23:38:24 +00:00
Shuo Qian
9b8835363c [automerger skipped] Merge "Fix Emergency Number API doc" am: 3d50a3df6d 
am: 06a361bb5f -s ours
am skip reason: change_id I4c9b682ef25378b9de91cd6255ed6fc514ea220d with SHA1 aca6eb7dac is in history

Change-Id: I63236fc667ba51d1423f09dcd783c511376c25f3
 2019-04-15 16:35:00 -07:00
Riddle Hsu
20bed88521 [automerger skipped] Merge "Get new surface if it was released from setWindowStopped" am: 90424e8060 
am: b1b6baee3a -s ours
am skip reason: change_id I2324ed32980aae5a3ec2efbd612e6c143c9a0022 with SHA1 af2748b28c is in history

Change-Id: I83e2cea55e8253116b411afc8732438c088ed7c8
 2019-04-15 16:29:09 -07:00
Hall Liu
4d6ce5406a Merge "Add EHPLMN and HPLMN to SubscriptionInfo" 2019-04-15 23:27:40 +00:00
Shuo Qian
06a361bb5f Merge "Fix Emergency Number API doc" 
am: 3d50a3df6d

Change-Id: I33cd5921ed6cb19078818fb52b204d59d1cc51c7
 2019-04-15 16:21:38 -07:00
Kevin Chyn
14e7742069 Merge "Add logging for KeyguardUpdateMonitor visibility and biometric state" into qt-dev 
am: fab88a833e

Change-Id: Idaeab80086330fb32987454b926297d12ee98cb8
 2019-04-15 16:19:35 -07:00
Riddle Hsu
b1b6baee3a Merge "Get new surface if it was released from setWindowStopped" 
am: 90424e8060

Change-Id: I0c90fa48d70bd3f3f5faeecd756fb7c28cbda85d
 2019-04-15 16:14:50 -07:00