Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
d2a4e1b39c resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab 
am: e2c9b1af3e

Change-Id: Iab52ff84be41c1d18274d1a82492b624a7456726
 2016-06-17 00:24:29 +00:00
Christopher Tate
34fb87b519 DO NOT MERGE: Don\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4 -s ours am: 41821a26a5 -s ours am: b1e31ad140 am: 918fb5d453 am: 2149ebeadf -s ours 
am: c61f35ed9a

Change-Id: Ied60b535ef69385c369110045ea755ebe9b0b94e
 2016-06-17 00:22:07 +00:00
Christopher Tate
e2c9b1af3e resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 
am: d6c1126fab

Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
 2016-06-17 00:18:48 +00:00
Christopher Tate
c61f35ed9a DO NOT MERGE: Don\\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4 -s ours am: 41821a26a5 -s ours am: b1e31ad140 am: 918fb5d453 
am: 2149ebeadf  -s ours

Change-Id: I42300992feac56eb94ab71e160da5fa8fc04929a
 2016-06-17 00:15:14 +00:00
Christopher Tate
d6c1126fab resolve merge conflicts of cffb19c to mnc-dev 
am: 3f9ea2d386

Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
 2016-06-17 00:15:07 +00:00
Dianne Hackborn
66ec21a817 Work on issue #29328569: NPE in " com.google.android.configupdater" 
Make the activity manager look at the "killed" state of a process
before deciding it is in a state where a new client can attach to
a content provider.  Hopefully this will get rid of some races
around attaching to providers and processes being killed.

Also add a little more information when killing a client of a
provider describing the oom adj of that provider's process.

Change-Id: I4efe5daf0a96e4663d5df88827ef401b1311de3f
 2016-06-16 17:05:47 -07:00
Adrian Roos
0f93a4ebe9 Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev 
am: a66746d167

Change-Id: I015d3019792ecb3e4d788ace36f1ae2c9e4fb4f8
 2016-06-16 23:41:20 +00:00
Andrew Solovay
76fe4fd14b Merge \"docs: DP4 release notes: add Android Auto known issue\" into nyc-dev 
am: bc7b3b5e52

Change-Id: I5a69215f86a7112d2208a60d3e72279e82d20dd1
 2016-06-16 23:34:00 +00:00
Adrian Roos
a66746d167 Merge "Remove RemoteInput on lockscreen setting" into nyc-dev 2016-06-16 23:33:57 +00:00
Christopher Tate
3f9ea2d386 resolve merge conflicts of cffb19c to mnc-dev 
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
 2016-06-16 16:31:39 -07:00
Andrew Solovay
bc7b3b5e52 Merge "docs: DP4 release notes: add Android Auto known issue" into nyc-dev 2016-06-16 23:29:14 +00:00
Christopher Tate
2149ebeadf DO NOT MERGE: Don\\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4 -s ours am: 41821a26a5 -s ours am: b1e31ad140 
am: 918fb5d453

Change-Id: I660124fada1a86288a9bfb10308cec0e1503f62e
 2016-06-16 22:53:29 +00:00
Christopher Tate
918fb5d453 DO NOT MERGE: Don\\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4 -s ours am: 41821a26a5 -s ours 
am: b1e31ad140

Change-Id: I3668160c863e8fe34ca6d233d63113069fec8e5a
 2016-06-16 22:50:23 +00:00
Christopher Tate
b1e31ad140 DO NOT MERGE: Don\\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 am: 6633a4fee4 -s ours 
am: 41821a26a5  -s ours

Change-Id: I028d0714c52079b71645197ac70a321285928fec
 2016-06-16 22:45:45 +00:00
Christopher Tate
41821a26a5 DO NOT MERGE: Don\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 
am: 6633a4fee4  -s ours

Change-Id: I2c10cc7ff790c84767167c76e028456ba4dcaeb3
 2016-06-16 22:39:05 +00:00
Sudheer Shanka
be8c83a6b9 Merge \"Allow apps with CREATE_USERS permission to create restricted users.\" into nyc-dev 
am: 48ee87d4a7

Change-Id: I3f66f1d5937ed29f62d687d1c0c6dcfa7d88637d
 2016-06-16 22:38:52 +00:00
TreeHugger Robot
48ee87d4a7 Merge "Allow apps with CREATE_USERS permission to create restricted users." into nyc-dev 2016-06-16 22:30:20 +00:00
Christopher Tate
cffb19c812 Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7 
am: ec6c3f7a32

Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf
 2016-06-16 22:30:17 +00:00
Christopher Tate
6633a4fee4 DO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 
am: f615799ef2

Change-Id: Ibc84666aa491986fe861b82400affde1675e632d
 2016-06-16 22:27:18 +00:00
Christopher Tate
ec6c3f7a32 Don\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f 
am: cd777e95a7

Change-Id: I199f1354df85fcda372002887eafc1e6fb9b19d8
 2016-06-16 22:27:04 +00:00
Christopher Tate
cd777e95a7 Don\'t trust callers to supply app info to bindBackupAgent() 
am: c58054f25f

Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c
 2016-06-16 22:21:37 +00:00
Christopher Tate
f615799ef2 DO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent() 
am: d85a4ed283

Change-Id: Ib1f01d4d10c82acb9f03aab4fe81d43d85d4a899
 2016-06-16 22:21:25 +00:00
Fyodor Kupolov
ec30ca35aa Call AppOpsService from the handler thread 
Otherwise it may cause deadlocks, for instance if
updateUserRestrictionsInternalLR is called with AMS lock held.

Bug: 28888422
Change-Id: I455c7392f206ff0bb6c99ec5c4a531921a115070
 2016-06-16 15:09:29 -07:00
Bill Yi
7085bb345d Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master 
am: ecfe1a5e17  -s ours

Change-Id: Icbdc4c2b98737adce95437613b0d0fc846a5a7e9
 2016-06-16 22:07:44 +00:00
Shreyas Basarge
bd4c3ea7ae Fix for the missing sync bug 
Cancel a job before re-scheduling it to avoid
the situation where a job could still be in
JobScheduler's pending queue.

Retry a sync even if it has specified the
do_not_retry extra if the sync failed due
to SyncAlreadyInProgress.

Bug: 27532761
Change-Id: Ia5d2b31fa4e44560a3f170a2bdbf53151bff7a20
 2016-06-16 23:01:59 +01:00
Bill Yi
ecfe1a5e17 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-06-16 21:59:44 +00:00
Bill Yi
7ea954a5e3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I987370579e491a8a7691748f090d111c93e3a89d
 2016-06-16 14:50:43 -07:00
John Reck
89132e094f Merge \\"Performance Optimization: Align texture dirty rect\\" am: 4e6a73c16a 
am: ec45adde70

Change-Id: Ice5c2f216dab71fe26b07f9299f8c4300b80f665
 2016-06-16 21:47:55 +00:00
Bill Yi
20631318aa Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I74afece623b34bf17ebe27d1e6254760adcda78a
 2016-06-16 14:44:59 -07:00
ywen
ec45adde70 Merge \"Performance Optimization: Align texture dirty rect\" 
am: 4e6a73c16a

Change-Id: I2bafdfadd3d6ff88be44475f77158236015acfde
 2016-06-16 21:42:13 +00:00
Wale Ogunwale
4e9c615769 Merge \"Don\'t re-launch activities while the device is sleeping\" into nyc-dev 
am: f6e3c9a553

Change-Id: Ib69f5adf861c011e7f5149287e87fec1431eb3e0
 2016-06-16 21:36:22 +00:00
Andrii Kulian
8b7544fad7 Merge \"Bring task to front when we can\'t move to adjacent stack\" into nyc-dev 
am: 320c15e1b2

Change-Id: I6e4ca3affec4c42e2e345360c75f3a10acb26272
 2016-06-16 21:36:18 +00:00
John Reck
4e6a73c16a Merge "Performance Optimization: Align texture dirty rect" 2016-06-16 21:35:12 +00:00
TreeHugger Robot
f6e3c9a553 Merge "Don't re-launch activities while the device is sleeping" into nyc-dev 2016-06-16 21:32:27 +00:00
Andrii Kulian
320c15e1b2 Merge "Bring task to front when we can't move to adjacent stack" into nyc-dev 2016-06-16 21:30:22 +00:00
Yorke Lee
3d80871032 Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev 
am: f33af2285b

Change-Id: I539f39cfea50f34dade2141829b21d422809b09f
 2016-06-16 21:22:22 +00:00
Yorke Lee
f33af2285b Merge "Limit global drags to apps targeting SDK 24 and above" into nyc-dev 2016-06-16 21:16:13 +00:00
Andrew Solovay
8316b81cd0 docs: DP4 release notes: add Android Auto known issue 
See first comment for doc stage location.

Change-Id: I424195565860af0439a9bf7fefb3286e82cc98da
 2016-06-16 14:12:33 -07:00
Gina Dimino
b7181150c4 Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev 
am: d06520a488

Change-Id: Ice3bd7016d11e4f8f50c09e7b6ba3cb613911a52
 2016-06-16 21:08:17 +00:00
Yi Kong
e8f9aa9d5d Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into stage-aosp-master 
am: e1cf90c6eb

Change-Id: Ib300b8d9ca4082abeebe3530c74537969330e1a7
 2016-06-16 21:02:40 +00:00
Przemyslaw Szczepaniak
dd094522bd Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c 
am: 9f4ad4fbb6

Change-Id: I18db994066406214705f36f2e10f0d39dcc279df
 2016-06-16 21:02:39 +00:00
Gina Dimino
d06520a488 Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev 2016-06-16 21:02:14 +00:00
Andreas Gampe
e1cf90c6eb Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into stage-aosp-master 2016-06-16 20:59:43 +00:00
Yi Kong
6635de0108 Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92 
(cherry picked from commit ade5c7c893)

Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
 2016-06-16 20:52:17 +00:00
Andrew Solovay
0d21553bd2 Merge \"docs: Minor update to DP4 release notes\" into nyc-dev 
am: 5a3a66a253

Change-Id: Ia2d95b95055115cc7c71333ded4a140d7873b15b
 2016-06-16 20:51:51 +00:00
Przemyslaw Szczepaniak
9f4ad4fbb6 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c 
test-current.txt update

Bug: 28666126

(cherry picked from commit aa021e854e)

Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
 2016-06-16 20:51:23 +00:00
TreeHugger Robot
5a3a66a253 Merge "docs: Minor update to DP4 release notes" into nyc-dev 2016-06-16 20:47:04 +00:00
Yigit Boyar
05eaab6a1e Docs: Completed updates to the Data Binding docs 
Bug: 28987432

Change-Id: I29d630618f9fff20e3c266f9b8ff59629fc607be
 2016-06-16 13:42:47 -07:00
Adrian Roos
b27d7a5e2e Remove RemoteInput on lockscreen setting 
Bug: 29370898
Change-Id: I8686c2266f13e7e131c2330673ec98c26037edaa
 2016-06-16 13:29:36 -07:00
Yujie Qin
d09b020ce5 Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev 
am: e09415344d

Change-Id: Id85ebdb2541c6145da39cf20684f85728f2ba0b6
 2016-06-16 20:05:17 +00:00