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

248777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Tate
1165790f70 Merge "Harden framework against backup transport crashes" into nyc-mr1-dev 2016-07-12 21:00:29 +00:00
Anthony Hugh
1b7c5631c4 Merge "Prevent back button from being handled by app after waking device" into nyc-mr1-dev 2016-07-12 20:39:06 +00:00
Sudheer Shanka
dbd5480ac4 Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756 -s ours am: 6ae7a5f72b am: 322e70cef3 am: a730e5977e am: cbe258aa27 -s ours 
am: 5b28589127

Change-Id: I1a8bfc2b3acb05edea636ba0c2e1eabaa83d8acb
 2016-07-12 20:01:06 +00:00
Sudheer Shanka
903fb640c6 Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88 am: 1bb51deaf4 -s ours 
am: 5441a248f4

Change-Id: Ib4f04849819432248e069997659215ecf2840e67
 2016-07-12 20:01:04 +00:00
Sudheer Shanka
5b28589127 Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756 -s ours am: 6ae7a5f72b am: 322e70cef3 am: a730e5977e 
am: cbe258aa27  -s ours

Change-Id: I1cd45ce38ea1859fef073124cd3362076b2c33e4
 2016-07-12 19:52:48 +00:00
Sudheer Shanka
5441a248f4 Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88 
am: 1bb51deaf4  -s ours

Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61
 2016-07-12 19:52:44 +00:00
Sudheer Shanka
cbe258aa27 Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756 -s ours am: 6ae7a5f72b am: 322e70cef3 
am: a730e5977e

Change-Id: Ic3f93423fed99fe6e1b1142e9f949866897954ae
 2016-07-12 19:47:49 +00:00
Sudheer Shanka
1bb51deaf4 Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 am: 008d66e49c 
am: e8458d8f88

Change-Id: If984b3437bc60d99e693907aef24f3b7b1218836
 2016-07-12 19:47:44 +00:00
Sudheer Shanka
a730e5977e Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756 -s ours am: 6ae7a5f72b 
am: 322e70cef3

Change-Id: I8c18ad1a029c13f1be022e12031f29d3cbba2220
 2016-07-12 19:42:40 +00:00
Sudheer Shanka
e8458d8f88 Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 
am: 008d66e49c

Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca
 2016-07-12 19:42:38 +00:00
Sudheer Shanka
322e70cef3 Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756 -s ours 
am: 6ae7a5f72b

Change-Id: I89dd8c81075ebc85173c5fc37e8a4d1dfe312bbb
 2016-07-12 19:34:39 +00:00
Sudheer Shanka
008d66e49c Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours 
am: 7975dd5b48

Change-Id: I343863180866b38af4f91a6f79068c21096e7ce0
 2016-07-12 19:34:38 +00:00
Sudheer Shanka
6ae7a5f72b Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 
am: 76c9d70756  -s ours

Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68
 2016-07-12 19:27:39 +00:00
Sudheer Shanka
7975dd5b48 Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e 
am: fd0757f195  -s ours

Change-Id: I17b97d1cfefa769b07ea798c6f87f8af22a31329
 2016-07-12 19:27:37 +00:00
Sudheer Shanka
76c9d70756 Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am: d327d73edf 
am: cb7e0643c9

Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42
 2016-07-12 19:20:38 +00:00
Sudheer Shanka
fd0757f195 Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f 
am: 177422c91e

Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
 2016-07-12 19:20:34 +00:00
Jason Monk
3750c9a15a Merge "SysUI: Protect against crash in BatteryController" into nyc-mr1-dev 2016-07-12 19:18:51 +00:00
TreeHugger Robot
2921dfac50 Merge "Don't hold a lock while loading default wallpaper" into nyc-mr1-dev 2016-07-12 19:18:08 +00:00
Sudheer Shanka
cb7e0643c9 Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev 
am: d327d73edf

Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1
 2016-07-12 19:11:37 +00:00
Sudheer Shanka
177422c91e Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev 
am: f1d9152f9f

Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
 2016-07-12 19:11:35 +00:00
Sudheer Shanka
d327d73edf Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev 2016-07-12 19:03:20 +00:00
Sudheer Shanka
f1d9152f9f Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev 2016-07-12 19:03:14 +00:00
Chris Tate
2917abeef2 Merge "Back up / restore lock wallpapers" into nyc-mr1-dev 2016-07-12 18:56:47 +00:00
Chris Tate
b9c057c316 Merge "Don't walk mutexed collections outside the mutex" into nyc-mr1-dev 2016-07-12 18:56:26 +00:00
Chris Tate
87488ac89b Merge "Fix up mangled SELinux labeling of wallpaper files" into nyc-mr1-dev 2016-07-12 18:56:20 +00:00
Christopher Tate
bf13ccf4b7 Back up / restore lock wallpapers 
If writing both system + lock wallpapers winds up hitting the
transport-defined quota, the next backup operation steps back
to storing only the system wallpaper.

Also makes sure to unbind full-backup target agents following
the backup operation.  In practice this usually doesn't matter
because the target gets killed following the operation, but
the wallpaper agent runs in the system process where this does
not happen, so was mistakenly being left in place and reused
for the next operation, failing to re-run the full create +
backup lifecycle.

Bug 28968107

Change-Id: I219c2ddd7e899a430ef4cf693b1259464c15eed5
 2016-07-12 18:34:05 +00:00
Alan Viverette
2c5da6668c Merge "Set up view state before attaching, jump drawables if needed" into nyc-mr1-dev 2016-07-12 18:13:22 +00:00
Kevin Hufnagle
05d6cc78de Merge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev 
am: 4c8d924d4c

Change-Id: I84f8209ce4c1f2a85c02398b3e7e7c30953cefd3
 2016-07-12 17:54:26 +00:00
Kevin Hufnagle
4c8d924d4c Merge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev 2016-07-12 17:49:10 +00:00
Android Build Merger (Role)
d2e6a62838 Merge "Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev am: e278cf7665" into nyc-mr1-dev 2016-07-12 17:47:25 +00:00
Julia Reynolds
7ac1886ae9 Merge "Improve jank on header change." into nyc-mr1-dev 2016-07-12 17:47:21 +00:00
Amith Yamasani
3bfbc531b3 Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev 
am: e278cf7665

Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624
 2016-07-12 17:46:58 +00:00
Amith Yamasani
e278cf7665 Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev 2016-07-12 17:40:13 +00:00
Fyodor Kupolov
b6378cf4ae Don't hold a lock while loading default wallpaper 
It currently causes lock contention during user switch, when instance of
WallpaperManager in SystemUI is accessed from multiple threads

Bug: 29039588
Change-Id: I4b827d54d10fbd3b188fb94f47e78a2967ecb480
 2016-07-12 10:39:56 -07:00
Jason Monk
324a28fc64 SysUI: Protect against crash in BatteryController 
Change-Id: I850177b961b59b342dde4dbf67c018ac68a42960
Fixes: 30033957
 2016-07-12 13:34:12 -04:00
Geoffrey Pitsch
859029ff7b Merge "OpenSL-based audio support for BootAnimation" into nyc-mr1-dev 2016-07-12 17:29:56 +00:00
Makoto Onuki
50752f7391 Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev 2016-07-12 17:09:32 +00:00
Julia Reynolds
bda516549c Improve jank on header change. 
Also fix expand icon ripple.

Bug: 30070005
Change-Id: I0a139778f14d5ba4ebee6e27a321af3827ecbe96
 2016-07-12 12:42:54 -04:00
Rubin Xu
26504a611a Merge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc-mr1-dev 2016-07-12 16:37:55 +00:00
Brad Ebinger
60bbfacd4e Merge "Add Group Id to PhoneAccount" into nyc-mr1-dev 2016-07-12 16:33:42 +00:00
Bill Yi
8d06bbf201 Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: a2e1bb8c3e  -s ours

Change-Id: Iff3609179536b7e76d0f2a0b221636d86f7b6a51
 2016-07-12 16:29:30 +00:00
Bill Yi
4ae2cc3803 Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: 84c67fa304  -s ours

Change-Id: I8da6418636bc11f64c226c8c3d995f7440ed04f7
 2016-07-12 16:29:28 +00:00
Joe Fernandez
b7c43bc613 Merge \"docs: July 2016 Dashboard update\" into nyc-dev 
am: ba64d0ec2e

Change-Id: Idc78d3c900d6aef1ff78183bd3f187def98aed0c
 2016-07-12 16:29:25 +00:00
TreeHugger Robot
86f7155e6f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-12 16:19:08 +00:00
TreeHugger Robot
a2e1bb8c3e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-07-12 16:12:00 +00:00
TreeHugger Robot
a8b4e7320a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-12 16:11:42 +00:00
Android Build Merger (Role)
3998b7a54b Merge "Merge \"App launch - Test app changes\" into nyc-dev am: 8fabbb89c0" into nyc-mr1-dev 2016-07-12 16:11:25 +00:00
TreeHugger Robot
84c67fa304 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-07-12 16:11:12 +00:00
Gopinath
8c5eb63835 Merge \"App launch - Test app changes\" into nyc-dev 
am: 8fabbb89c0

Change-Id: I0b14fe4a4dd9414d9fe9d15980e8058a7b3d9e29
 2016-07-12 16:11:01 +00:00
TreeHugger Robot
fd3dc6d96d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-12 16:10:13 +00:00