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

153686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
eb6810a2ab am a02e2cd8: am b0be9926: (-s ours) am 889ec192: am a7ce1107: am 19fa86cf: am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'a02e2cd8baa7204da99ee828a130c92a0a5b283f':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 20:01:46 +00:00
Deepanshu Gupta
f579bce0de am 54f5b95f: am 2be81615: (-s ours) am 9f7c594a: am ae6f2595: am 409e42a1: am e19464aa: (-s ours) am 9ee1556d: am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '54f5b95f4d66ea84923ab69e041528ce6ab49f41':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 20:01:41 +00:00
Jean-Michel Trivi
68e0127f22 am b031a32c: am 7632ed91: am 525e552e: am 800f3ca4: am 14c8acef: am 5fb35780: am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit 'b031a32c65f97aaae35f3ee00b8ed537ac322563':
  Do not restore the media button event receiver
 2014-09-04 20:01:37 +00:00
Craig Mautner
66eb521833 Eliminate deadlock by deferring wipe data call 
The call to RecoverySystem.rebootWipeUserData() was made while
holding the lock to DevicePolicyManagerService. But it blocks
waiting for system_process' main thread to receive the ordered
broadcast complete callback. It won't receive that callback
because Keyguard is running on the main thread and is concurrently
blocked on DevicePolicyManagerService.

By moving the call to rebootWipeUserData() out of the synchronized
block the deadlock is eliminated.

Fixes bug 16870054.

Change-Id: I3eb587211e5484859cc9dab7e80e5a1f6c85225d
 2014-09-04 12:56:39 -07:00
Jason Monk
9f30ce3b82 Merge "Proxy fixes from API review feedback" into lmp-dev 2014-09-04 19:52:03 +00:00
Deepanshu Gupta
75c6c90aa8 am 4576f597: am 9bfa0736: am 7119fbb6: am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT 
* commit '4576f597078ade77c38a6432d8ae4edc85446db5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 19:49:26 +00:00
Deepanshu Gupta
df5c2a9627 am 0d5a7d7f: am 8929642c: am 0ff5117f: am 7055778e: am a9f56d5a: (-s ours) am 44db2b3e: am 5d1755e9: am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MER 
* commit '0d5a7d7f41c0c7bd920fda0e7d4780dc639c90f1':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 19:49:22 +00:00
Deepanshu Gupta
acf556a29e am b0be9926: (-s ours) am 889ec192: am a7ce1107: am 19fa86cf: am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b0be99261ae96df7c29856eccc571e54247fa3a5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 19:49:17 +00:00
Ye Wen
5f34c5b89b am f9723425: Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev 
* commit 'f9723425d6fca88a51a42b50a073246563d78668':
  Add missing mms_config key enableGroupMms to SmsManager (1/2)
 2014-09-04 19:49:15 +00:00
Deepanshu Gupta
407453a57b am 2be81615: (-s ours) am 9f7c594a: am ae6f2595: am 409e42a1: am e19464aa: (-s ours) am 9ee1556d: am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '2be81615b2b862ee064d5ed03e8ba44d6168b3ff':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 19:49:13 +00:00
Jean-Michel Trivi
ba36392557 am 7632ed91: am 525e552e: am 800f3ca4: am 14c8acef: am 5fb35780: am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit '7632ed91d91906504212cb7acc85128c89d6d3c7':
  Do not restore the media button event receiver
 2014-09-04 19:49:08 +00:00
Jason Monk
8fa067ca6d am 2d084e75: Merge "Change constants from API review feedback" into lmp-dev 
* commit '2d084e7555715623213f6fdb7bd0af4505710b22':
  Change constants from API review feedback
 2014-09-04 19:49:06 +00:00
Raph Levien
875062059c Fix Layout.isRtlCharAt 
We weren't getting correct results from Layout.isRtlCharAt, because it
was only testing half of the correct predicate for whether the argument
was inside the run. This patch restores the correct predicate.

Bug: 17381011
Change-Id: Ib0a77cc182f4ca4bfe824e85b7aff7268f465d73
 2014-09-04 12:47:03 -07:00
Ye Wen
f40275d35e Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev 2014-09-04 19:45:01 +00:00
Jason Monk
d8927a84fb Merge "Change constants from API review feedback" into lmp-dev 2014-09-04 19:40:30 +00:00
Jason Monk
8236413ce0 Proxy fixes from API review feedback 
Bug: 17389383
Change-Id: Ib5e40f55d02687ee917ba30773123cf3e4c2a97d
 2014-09-04 15:39:56 -04:00
Svetoslav
d97bf6920b Add a missing dependency on a shared JNI library 
bug:17389508

Change-Id: I38e1ad7daf991f37458eac391b472eb3816d7838
 2014-09-04 12:37:52 -07:00
Nancy Chen
03221abb80 am 25627648: am c27868a6: Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev 
* commit '256276488d399414d69ed0e233cccfb6c4a496ce':
  Remove check for voicemail number when parsing URI phone number.
 2014-09-04 19:36:56 +00:00
Kenny Guy
44dfe678b3 am 68fc49ee: am 56e125ff: Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 
* commit '68fc49ee0ac26467dd2c2e4dbc9cea7124ae05a2':
  Revert "Ensure all RemoteViews use myUserId rather than context."
 2014-09-04 19:36:51 +00:00
Nancy Chen
1a57311d1d am c27868a6: Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev 
* commit 'c27868a6d085f10f6ca4f4a83c382078648f21e7':
  Remove check for voicemail number when parsing URI phone number.
 2014-09-04 19:29:54 +00:00
Kenny Guy
325221c07b am 56e125ff: Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 
* commit '56e125ff1d6d1cde633b1154b07e1efddc5293e9':
  Revert "Ensure all RemoteViews use myUserId rather than context."
 2014-09-04 19:21:52 +00:00
Nancy Chen
81a0cbcda3 Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev 2014-09-04 19:21:30 +00:00
Alan Viverette
a2362c9251 Clear ripple animations on cancel/end 
This prevents subsequent calls to end() from snapping the background
opacity (among others) back to 1.

BUG: 17357749
BUG: 17349157
Change-Id: I2a4870ed588ba98986428983bf29b556cdc9a701
 2014-09-04 12:16:40 -07:00
Adam Lesinski
7f61e96db7 Add Configuration changes to UsageStats 
Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
 2014-09-04 12:15:32 -07:00
Kenny Guy
6e0a5aef30 Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 2014-09-04 19:14:25 +00:00
Yorke Lee
5c9d442150 am e490fd6d: am ddd81fb1: Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 
* commit 'e490fd6dd3f763a3189c8c3f8a0db244a74e5796':
  Turn off FORCE_LOGGING in Telecomm
 2014-09-04 19:10:49 +00:00
Yorke Lee
6f925a3cd3 am ddd81fb1: Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 
* commit 'ddd81fb1dc5cadc243d1ae617cd4d4c3178fc4dc':
  Turn off FORCE_LOGGING in Telecomm
 2014-09-04 19:04:21 +00:00
Yorke Lee
b501eb7ae2 Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 2014-09-04 18:55:30 +00:00
Svetoslav
100dfcd2fa am b57127fd: am af08fbbf: Merge "Update accessibility focused virtual view bounds." into lmp-dev 
* commit 'b57127fd037be7f78d62a9c39a4031c19181d6de':
  Update accessibility focused virtual view bounds.
 2014-09-04 18:52:22 +00:00
dcashman
c287fb2ffd am d285ab9a: am 0dd7e085: Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 
* commit 'd285ab9a7b50bde8f65986139bdc0b30db701395':
  Add upgrade KeySets check to permission pruning on install.
 2014-09-04 18:52:16 +00:00
Svetoslav
82f04551f5 am a211481a: am ca24b463: Merge "Fix collection iteration index." into lmp-dev 
* commit 'a211481a57d4eda2830324b7ae254f2d4e9dcf3d':
  Fix collection iteration index.
 2014-09-04 18:52:11 +00:00
Svetoslav
2a87119065 am af08fbbf: Merge "Update accessibility focused virtual view bounds." into lmp-dev 
* commit 'af08fbbff429e08426e59fb0911a8be09d6c7062':
  Update accessibility focused virtual view bounds.
 2014-09-04 18:45:44 +00:00
dcashman
adf8c0b9e3 am 0dd7e085: Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 
* commit '0dd7e085f55dadbd5277f5cbb212705dbe27f7a5':
  Add upgrade KeySets check to permission pruning on install.
 2014-09-04 18:45:39 +00:00
Svetoslav
fcc65d11a1 am ca24b463: Merge "Fix collection iteration index." into lmp-dev 
* commit 'ca24b4630e43f48ddeb0a70b918112719c200160':
  Fix collection iteration index.
 2014-09-04 18:45:34 +00:00
Svetoslav
ac0d317c31 Merge "Update accessibility focused virtual view bounds." into lmp-dev 2014-09-04 18:40:05 +00:00
dcashman
977c5bec52 Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 2014-09-04 18:39:35 +00:00
Svetoslav
f96f52ea51 Merge "Fix collection iteration index." into lmp-dev 2014-09-04 18:39:02 +00:00
Yorke Lee
f3dba2f77d Turn off FORCE_LOGGING in Telecomm 
Bug: 17329799
Change-Id: Ic93cfaee62f83b457da3982237170e299c63cf5d
 2014-09-04 11:33:38 -07:00
Ye Wen
fe4bf48b92 Add missing mms_config key enableGroupMms to SmsManager (1/2) 
b/17390011

Change-Id: I6bef36521de6cd1644f83a667753542313fa8d8b
 2014-09-04 11:32:14 -07:00
Jason Monk
5503a55c0b Change constants from API review feedback 
Bug: 17390600
Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91
 2014-09-04 14:25:45 -04:00
Svetoslav
298a6c6b29 Fix collection iteration index. 
bug:17387880

Change-Id: Ic637ce8fa2da87d6f21a222bd70bf627953f57e3
 2014-09-04 11:20:25 -07:00
Michael Wright
4bed617911 am 3835c405: am c27c79f1: Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev 
* commit '3835c40568592820429b81185a4b9d4b7de34aff':
  Add support for SW_CAMERA_LENS_COVER.
 2014-09-04 18:17:44 +00:00
Deepanshu Gupta
4576f59707 am 9bfa0736: am 7119fbb6: am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into 
* commit '9bfa073662748e2d0b4b08cfa7fa312e7023f75c':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 18:17:42 +00:00
Deepanshu Gupta
0d5a7d7f41 am 8929642c: am 0ff5117f: am 7055778e: am a9f56d5a: (-s ours) am 44db2b3e: am 5d1755e9: am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '8929642ca72981f3c5cd4e7d408d47c724d9127b':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 18:17:38 +00:00
George Mount
7a4dee660b am 9169d544: am ae572ad4: Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 
* commit '9169d544573479d30ff47f303c34cf62e54b37fc':
  "Back" with translucent window now sets ActivityOptions.
 2014-09-04 18:17:35 +00:00
Deepanshu Gupta
b0be99261a am 889ec192: am a7ce1107: am 19fa86cf: am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '889ec19249fecfa7121c77b4c2bb32a054311cb5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 18:17:32 +00:00
Deepanshu Gupta
2be81615b2 am 9f7c594a: am ae6f2595: am 409e42a1: am e19464aa: (-s ours) am 9ee1556d: am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '9f7c594a05411191d83ccb21655fbd8d52f56189':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 18:17:28 +00:00
Jean-Michel Trivi
7632ed91d9 am 525e552e: am 800f3ca4: am 14c8acef: am 5fb35780: am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit '525e552eef3e38f3ab1a61377ebe69af43e959d7':
  Do not restore the media button event receiver
 2014-09-04 18:17:24 +00:00
Baligh Uddin
f571341585 am 6909c794: (-s ours) am 576fad6d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6909c794dd0f9edf65ea06956993f7dac5a970f2':
  Import translations. DO NOT MERGE
 2014-09-04 18:12:40 +00:00
Baligh Uddin
19e5c27560 am 5e96ee32: (-s ours) am 84004db4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5e96ee324a3d9476e040f69cfe6b82eaa631f819':
  Import translations. DO NOT MERGE
 2014-09-04 18:12:36 +00:00