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

150048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
3c38215198 am f225a5c2: Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 
* commit 'f225a5c2410eb7a9417f02e65afbe0f92a338a25':
  AudioManager: only use main looper for AudioPort event handler
 2014-09-04 21:04:30 +00:00
Alan Viverette
7568d9df75 am 69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 
* commit '69dc952dba40c2c5ab3f0e596391e330ff9f71c8':
  Fix AM/PM text i18n and clean up keyboard support in time picker
 2014-09-04 21:04:25 +00:00
Alan Viverette
8a4e36c8d6 am cfad03e3: Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 
* commit 'cfad03e3088ea3f673859c1ada257f299b4ebe68':
  Fix clip rect when drawing accessibility focus rect
 2014-09-04 21:04:21 +00:00
Craig Mautner
432123fc9a am ac8731f9: Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 
* commit 'ac8731f94bb416be0cc54f226bda1929b0cba2c0':
  Eliminate deadlock by deferring wipe data call
 2014-09-04 21:04:18 +00:00
Raph Levien
319f142cf5 am 58e457cc: Merge "Fix Layout.isRtlCharAt" into lmp-dev 
* commit '58e457ccaf9d9b864d4033be18ddf0e71a218952':
  Fix Layout.isRtlCharAt
 2014-09-04 21:04:14 +00:00
Alan Viverette
af5f7c7060 am 3d6f0211: Merge "Clear ripple animations on cancel/end" into lmp-dev 
* commit '3d6f02118c08b45e1b9a4b9a28ca494db4bf5e3e':
  Clear ripple animations on cancel/end
 2014-09-04 21:04:10 +00:00
Eric Laurent
b6efa23adc Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 2014-09-04 20:47:44 +00:00
Alan Viverette
3b256c850c Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 2014-09-04 20:45:12 +00:00
Alan Viverette
c65e9a480a Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 2014-09-04 20:44:38 +00:00
Craig Mautner
127343cb46 Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 2014-09-04 20:41:39 +00:00
Prabhakar Thirumoorthy
10d9b4104b am bbc5508d: Merge "Add a missing dependency on a shared JNI library" into lmp-dev 
* commit 'bbc5508df13852f2e95bedaedc3fba9b202f9a67':
  Add a missing dependency on a shared JNI library
 2014-09-04 20:41:20 +00:00
Adam Lesinski
58a3104206 am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev 
* commit '0c0fcce6a5ce39df0161a78fbb0577d4c70a7a87':
  Add Configuration changes to UsageStats
 2014-09-04 20:41:16 +00:00
Jing Zhao
74e76d2ac7 am 2c8b3f19: AT&T short dialing code 
* commit '2c8b3f19d4a2e575a769d6d9ff2ea16947cd22ce':
  AT&T short dialing code
 2014-09-04 20:41:12 +00:00
Raph Levien
37d611198f Merge "Fix Layout.isRtlCharAt" into lmp-dev 2014-09-04 20:40:45 +00:00
Alan Viverette
680e425596 Merge "Clear ripple animations on cancel/end" into lmp-dev 2014-09-04 20:40:06 +00:00
Prabhakar Thirumoorthy
785040f483 Merge "Add a missing dependency on a shared JNI library" into lmp-dev 2014-09-04 20:38:09 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Jing Zhao
078dede1de AT&T short dialing code 
User should be able to dial 0 or 00 in AT&T network.
The code should not be taken as MMI Code.

Bug: 17314389
Change-Id: I2f4187ddcbad6d78ee8d8c1881648b96a9da76dd
 2014-09-04 20:21:04 +00:00
Alan Viverette
eb3ca22426 Fix clip rect when drawing accessibility focus rect 
BUG: 17320910
Change-Id: I4112c2c9c10187d4b085c7eb96112fab090612ce
 2014-09-04 13:09:34 -07:00
Jason Monk
7b72d72259 am f06881a4: Merge "Proxy fixes from API review feedback" into lmp-dev 
* commit 'f06881a4755f146efcc2abca83f48580f16f794f':
  Proxy fixes from API review feedback
 2014-09-04 20:03:38 +00:00
Deepanshu Gupta
534ba99f99 am 1de3eb07: 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 prop 
* commit '1de3eb0784033545b2fac98c43e317e70933e3c5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 20:03:35 +00:00
Deepanshu Gupta
0ab8eaa483 am 1e1e8b58: 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 
* commit '1e1e8b5804d0c808ee3ea5a02009a2b1e240d02b':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 20:03:31 +00:00
Deepanshu Gupta
cd78a02d66 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:03:28 +00:00
Deepanshu Gupta
71d16ea096 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:03:25 +00:00
Jean-Michel Trivi
646ca0848e 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:03:21 +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
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
Ye Wen
d97245e54e 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:06 +00:00
Jason Monk
c9cf46a60e 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:02 +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
c7880d3f98 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:51 +00:00
Kenny Guy
86a944e2ad 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:53 +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
ee2b005d57 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:03 +00:00
Yorke Lee
b501eb7ae2 Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 2014-09-04 18:55:30 +00:00
Svetoslav
9471dc19a8 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:32 +00:00
dcashman
e714799bca 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:28 +00:00
Svetoslav
5a67469c9a am ca24b463: Merge "Fix collection iteration index." into lmp-dev 
* commit 'ca24b4630e43f48ddeb0a70b918112719c200160':
  Fix collection iteration index.
 2014-09-04 18:45:24 +00:00