drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,341 Commits 1 Branch 0 Tags
Commit Graph

245341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lifu Tang
cbd2a140c1 Added more logs to track WakeLock usages 
Bug: 28829595
Change-Id: I607745a27e830e42300ee307412e57c2254bff55
 2016-06-22 10:57:55 -07:00
Adam Lesinski
ec6db57ac7 Merge "Prevent early boot crash reading PowerProfile" into nyc-dev 2016-06-22 17:31:35 +00:00
Fyodor Kupolov
9bbaacf845 Use granted userId to look up provider info 
In getPersistedUriPermissions, use granted userId instead of the calling
userId to look up provider info.

Bug: 29058113
Change-Id: Ia637be414f9ef3b8e9bce13bb56bd335cfb28ac7
 2016-06-22 10:31:18 -07:00
Adam Lesinski
1a76a62b8d Prevent early boot crash reading PowerProfile 
The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.

Bug:29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d
 2016-06-22 10:28:47 -07:00
smain@google.com
31b49837a1 add direct path to sdk manager docs for studio UI help button 
bug: 28982864

Change-Id: I4186de00d0a80e54066dd209d55ecf1348a30337
 2016-06-22 10:28:02 -07:00
Scott Main
7bb456d6c5 Merge "add redirect for old link to publishing docs" into nyc-dev 2016-06-22 17:22:45 +00:00
Chong Zhang
75c7cc6ca9 Merge "Unblock 'am start -W' if activity is brought to front without launching" into nyc-dev 2016-06-22 17:17:48 +00:00
Dianne Hackborn
a62a7eef24 Merge "Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag..." into nyc-dev 2016-06-22 17:12:09 +00:00
Daniel Yu
83b25f7c46 docs: Fixing MediaSession note in PIP preview docs 
Updating PIP preview docs to mention that devs need to
use MediaSession.setCallback to get input events while in
PIP mode, and not MediaSession.setMediaButtonReceiver.

Note: Changes also include changes made previously for
DP4 in a different branch that for some reason were not
auto-merged into mnc-io-docs, so including these changes
as well to ensure they don't get overwritten.

Bug: 29215189
Change-Id: Iab51c26ebd1f1403633eb9a1616d43690173446c
 2016-06-22 10:07:32 -07:00
Mady Mellor
6b6bf9cd54 Merge "Don't show the shade background for heads up notifications" into nyc-dev 2016-06-22 16:49:42 +00:00
TreeHugger Robot
126088536d Merge "QS Tiles: Fix some problems with connecting through intent" into nyc-dev 2016-06-22 16:47:33 +00:00
Todd Kennedy
4001d7b6c4 Merge "Update prebuilts from build server" into nyc-dev 2016-06-22 16:46:04 +00:00
Todd Kennedy
356fe48224 Update prebuilts from build server 
CtsShim.apk
versionCode='24' versionName='7.0-2996264'

CtsShimPriv.apk
versionCode='24' versionName='7.0-2996264'

Built here:
https://android-build.googleplex.com/builds/submitted/2996264/CtsShim/latest

This build is suitable for public release.

Bug: 29122339
Change-Id: I6533e3a3ed72de6d3887039e3e8cf527947c4166
 2016-06-22 09:39:49 -07:00
Julia Reynolds
00d9d9f11e Don't iterate over a list items are removed from. 
Change-Id: I896cd4578da15e21d422ca8db42e34bbd10912e8
Fixes: 29512540
 2016-06-22 16:34:06 +00:00
Jeff Sharkey
a31460ce12 Start primary storage move outside lock. 
Otherwise there is a potential deadlock when an unsolicited event
arrives from vold while we're still waiting for the move operation
to be processed.

The safe fix here is to kick off the move after dropping the lock.

Bug: 29501052
Change-Id: I2160c6a7a19c1d9981c692a2be2b04019352db2e
 2016-06-22 10:32:17 -06:00
Jason Monk
94a20367b5 Merge "QS: Fix default icon handling for services" into nyc-dev 2016-06-22 15:39:32 +00:00
TreeHugger Robot
8f41c074c7 Merge "Blacklist ATV Remote Service to never appear on Recents" into nyc-dev 2016-06-22 15:36:11 +00:00
Jason Monk
8753e184f9 QS Tiles: Fix some problems with connecting through intent 
- Don't send Tile through intent, it can cause crashes
 - Clean up other issues surrounding this

Change-Id: I08c626cf39b36d349592c1e0b81627b9bc7eeeb3
Fixes: 29519485
 2016-06-22 10:52:58 -04:00
Jason Monk
a5f6ed355e QS: Fix default icon handling for services 
Change-Id: I3b25df8b8d02cd99a943571de14cf0a8c5b051bd
Fixes: 29452288
 2016-06-22 10:00:38 -04:00
Jason Monk
ba568a46e6 Merge "Restrict hotspot qs tile to admin user" into nyc-dev 2016-06-22 13:23:30 +00:00
Jason Monk
3a0241566b Merge "QS Edit: Try to simplify drag logic" into nyc-dev 2016-06-22 13:23:18 +00:00
Nicolas Prévot
2058553b8d Merge "Don't allow showing an activity if user is stopping or shutting down." into nyc-dev 2016-06-22 12:27:14 +00:00
Nicolas Prevot
1219c924bd Don't allow showing an activity if user is stopping or shutting down. 
BUG:29264996
Change-Id: I9fc97c5dc37e6d5656b82b277954b5963eb345c4
 2016-06-22 10:21:16 +01:00
Dianne Hackborn
121e1645d1 Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag... 
...isn't respected if previous job was scheduled with same URI

Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
 2016-06-21 20:39:02 -07:00
Chong Zhang
5022da313f Unblock 'am start -W' if activity is brought to front without launching 
If -W is used to start an activity successfully, but this activity just
brings another activity to front without actual launching, the waiting
will be stuck because neither activity will report launch complete.

In this case, we have to treat it as if the -W started an activity and
received return code START_TASK_TO_FRONT. It needs to wait for the new
activity to become visible (or report launch complete if it's already
visible).

This reverts earlier commits afb776d5447e19565c9a826a554911decb9ed92a,
since it's causing problems with launch time reporting.

bug: 28333487
bug: 29451567
Change-Id: I9fd79ab5b3ed8f9de5df34ed9c7b0be3a94620b2
 2016-06-21 19:44:09 -07:00
TreeHugger Robot
c211539769 Merge "Revert "Parse "vendor/priv-app" to find privileged applications"" into nyc-dev 2016-06-22 01:13:56 +00:00
Eric Laurent
34ed8ad3c2 Merge "Fix JAVA doc for AudioRecord and AudioTrack Builder" into nyc-dev 2016-06-22 01:08:45 +00:00
Adam Lesinski
4ece3d6bb1 ContextImpl: Keep DisplayAdjustments and Display in sync 
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.

Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
 2016-06-21 17:55:58 -07:00
Dirk Dougherty
cdb7434140 Merge "Doc change: remove common images from localized directories." into nyc-dev 2016-06-22 00:38:27 +00:00
TreeHugger Robot
394cc084f9 Merge "Notification: Respect disabled HUNs on updates" into nyc-dev 2016-06-22 00:35:30 +00:00
TreeHugger Robot
ea16efd52c Merge "Fix stale transformations" into nyc-dev 2016-06-21 23:25:16 +00:00
Sudheer Shanka
e4e424d80d Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc -s ours am: e01775f0be am: 5e41f90a92 am: 80e720742b 
am: 565d13f17e  -s ours

Change-Id: I141d8fb97fc5aac644ef50ff07f055ec7a03823e
 2016-06-21 23:17:44 +00:00
Sudheer Shanka
565d13f17e Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc -s ours am: e01775f0be am: 5e41f90a92 
am: 80e720742b

Change-Id: I745cd1c7129c79daa13c90fe6bbcef43cb39dce2
 2016-06-21 23:14:52 +00:00
smain@google.com
bc364fc1a1 add redirect for old link to publishing docs 
Change-Id: Iabf814d79783c8dd9e815243292519e43b1bbf9e
 2016-06-21 16:14:08 -07:00
Adrian Roos
f6967e0691 Notification: Respect disabled HUNs on updates 
Fixes a bug where HUNs would be posted on updates
even if HUNs had been disabled.

Fixes: 29520322
Change-Id: I3806b9c5b8835a62f7b58bd0a3bbdd55b02eb892
 2016-06-21 16:13:05 -07:00
Sudheer Shanka
00e79982aa Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours am: 199f6a490a am: 06c3f60136 am: 9088be4ebe 
am: 95c9bef53b  -s ours

Change-Id: I7b406c32d9231f2850651d09fc58e2dc50c38b8a
 2016-06-21 23:11:08 +00:00
Sudheer Shanka
80e720742b Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc -s ours am: e01775f0be 
am: 5e41f90a92

Change-Id: I5b9897a2a3e44faed6f101c52ab729612404c739
 2016-06-21 23:10:54 +00:00
Sudheer Shanka
95c9bef53b Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours am: 199f6a490a am: 06c3f60136 
am: 9088be4ebe

Change-Id: I886553aec1438d0857cdc52413008ecaf64bae2a
 2016-06-21 23:05:02 +00:00
Sudheer Shanka
9088be4ebe Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours am: 199f6a490a 
am: 06c3f60136

Change-Id: Ie7b8e901e3fbb46f3d7d76b1bc8ea8bc6c31eb63
 2016-06-21 22:55:40 +00:00
Sid Soundararajan
6f134fb3ef Blacklist ATV Remote Service to never appear on Recents 
BUG: 28764678
Change-Id: I0be5f9f408f16cfb683793a84cef7a368e5fa867
 2016-06-21 15:49:13 -07:00
Sudheer Shanka
5e41f90a92 Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc -s ours 
am: e01775f0be

Change-Id: Ia4ac90dc59c50aabd1c3de69885c1312e37d915a
 2016-06-21 22:42:25 +00:00
Sudheer Shanka
b0de5fd328 Merge \\\\"Add pm operation to set user restrictions.\\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 am: 916728bb35 
am: 4e8aa0f35f  -s ours

Change-Id: Id82e4921ebc46dcf802acad895410ed79026d9ce
 2016-06-21 22:42:23 +00:00
Sudheer Shanka
06c3f60136 Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254 -s ours 
am: 199f6a490a

Change-Id: Ia9f6d50c60621431781986062491e7c3fbf92f94
 2016-06-21 22:42:23 +00:00
Sudheer Shanka
a5e89439ff Merge \\\\"Reduce shell power over user management.\\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f am: fb87ae59b0 
am: 63e8198685  -s ours

Change-Id: Id8035a1dde1a4ec04779e68ae14df5d2d4e2530f
 2016-06-21 22:38:39 +00:00
Sudheer Shanka
e01775f0be Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d 
am: 47da8a0bdc  -s ours

Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438
 2016-06-21 22:36:46 +00:00
Sudheer Shanka
199f6a490a Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 am: e0cc5e20ae 
am: 0d457d1254  -s ours

Change-Id: Idd92350e26a28821ddc2f9af505b28b5873a7f78
 2016-06-21 22:36:43 +00:00
Sudheer Shanka
47da8a0bdc Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 
am: a9b937b29d

Change-Id: Ib0923227e223a7b3a94e4d443e6e5c308977e65b
 2016-06-21 22:31:11 +00:00
Sudheer Shanka
0d457d1254 Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0 
am: e0cc5e20ae

Change-Id: Ia32fa9009d31f280b7f71fd8ed472913c4aa30b6
 2016-06-21 22:31:09 +00:00
Sudheer Shanka
a9b937b29d Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am: b43fe62933 -s ours 
am: 96676a2d41

Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1
 2016-06-21 22:25:34 +00:00
Sudheer Shanka
4e8aa0f35f Merge \\\"Add pm operation to set user restrictions.\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 
am: 916728bb35

Change-Id: Id7990003b3a5a6db9f9d16eb57ec37d47505165a
 2016-06-21 22:25:31 +00:00