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

145204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Wang
37491722af am 2b84d320: Fix bug of ScanSettings. Add unit test. 
* commit '2b84d320ed367ffdc77ae3e54eb1dc8f367390e6':
  Fix bug of ScanSettings. Add unit test.
 2014-07-25 18:47:19 +00:00
Craig Mautner
ff3efc2dac am 40185726: am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev 
* commit '401857269b9d15b3967c60b409792f2dae8a2df9':
  Finish crashed activities immediately
 2014-07-25 18:47:15 +00:00
Jon Miranda
1c1b7cb0a1 am aaea8e54: Fixes the build. 
* commit 'aaea8e545704e39e30a228ca25b0acde648b0d08':
  Fixes the build.
 2014-07-25 18:47:05 +00:00
Chris Craik
738ec3aace Revert "Dump RenderThread stack on unresponsive" 
bug:16563871
bug:16565900
bug:16555847
bug:16551643

This reverts commit ca66e06b9db6e6c921662886e4b7ddd02ac92280.

Change-Id: I23e8d4eaf828b1b298126ba5f36e4e8e7451706a
 2014-07-25 18:26:36 +00:00
Yao Chen
186655285f fix build 
Change-Id: Id5a93019b60ac4881f398b80de2e14786776a883
 2014-07-25 11:23:30 -07:00
Paul Soulos
6b2dd6337e Adds getTypeLabel to ContactsContract Event 
Bug: 16550284
Change-Id: Ie95093a2c9bca2b9ba130dea470c8beef94cd659
 2014-07-25 18:17:35 +00:00
Fabrice Di Meglio
3fbad42a4b Fix bug #16307124 Not able to select hour 12 in TimePicker with 24-hour time enabled 
- ahhh modulo ...

Change-Id: Ief08594590480bfcecc09cad1f782e57b05d9786
 2014-07-25 18:06:25 +00:00
Yao Chen
8470857ee4 Fix build 
Change-Id: Ia2a09417451dd9cdca0a6351b8ddd00f9195f361
 2014-07-25 11:01:45 -07:00
Wei Wang
ec64dbfbc0 Fix bug of ScanSettings. Add unit test. 
b/16318637.

Change-Id: I3fbc1212c1712faa0c29132f3dc9cfc1d58af26b
 2014-07-25 10:56:08 -07:00
Craig Mautner
5ec618e3c3 am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev 
* commit 'a9c5257a15f2efb5c017d2ecadb5a7360230bfee':
  Finish crashed activities immediately
 2014-07-25 17:43:37 +00:00
Jon Miranda
ca7a229eab Fixes the build. 
Change-Id: I4d0f04c480ff787e5f0310fd92a3734180154a9a
 2014-07-25 10:35:14 -07:00
Selim Cinek
7807cb6902 am 4f5e6929: Merge "Reintroduced the clear all button" into lmp-dev 
* commit '4f5e692954e3918f994c380a723e26670fd02769':
  Reintroduced the clear all button
 2014-07-25 17:30:43 +00:00
Adam Lesinski
54e650196a am 4d5eda90: am 42460fd6: Add Per-User logging of UsageStats 
* commit '4d5eda904054382c118622d2d46546189dbbf70b':
  Add Per-User logging of UsageStats
 2014-07-25 17:27:27 +00:00
Adam Lesinski
0433a1e178 am 42460fd6: Add Per-User logging of UsageStats 
* commit '42460fd6e857a604d999ece8d9bd336b9c9365cc':
  Add Per-User logging of UsageStats
 2014-07-25 17:22:36 +00:00
Adam Lesinski
3c153519ca Add Per-User logging of UsageStats 
Change-Id: I4518c5d3c56b3821292accb886f9fb21f3a8b25f
 2014-07-25 17:18:54 +00:00
Amith Yamasani
7f41be4cac am f4b195c9: am 1f348428: Merge "Don\'t update user\'s setup state unless it changed" into lmp-dev 
* commit 'f4b195c9791b6112beb86119a5dd8ab7c55a5201':
  Don't update user's setup state unless it changed
 2014-07-25 17:12:11 +00:00
Amith Yamasani
1886ccdaf9 am 1f348428: Merge "Don\'t update user\'s setup state unless it changed" into lmp-dev 
* commit '1f348428c7faba30906c0fb60e142377ea3c0f71':
  Don't update user's setup state unless it changed
 2014-07-25 17:07:47 +00:00
Dan Sandler
9d9f1a7f6a am 89f39a56: am 84be3b85: Don\'t crash when drawing zero pixels. 
* commit '89f39a560a072c972931e0b6707d4ec9560a8f8e':
  Don't crash when drawing zero pixels.
 2014-07-25 17:04:05 +00:00
Dan Sandler
2ed1b4c747 am 84be3b85: Don\'t crash when drawing zero pixels. 
* commit '84be3b852b2c650c6c3879306dc38d996029f897':
  Don't crash when drawing zero pixels.
 2014-07-25 16:50:49 +00:00
Dan Sandler
1968201b44 Don't crash when drawing zero pixels. 
Bug: 16561522
Change-Id: Ia3a2d2930abc393dbe587053f598246c49c0c9c4
 2014-07-25 16:46:47 +00:00
Jon Miranda
eb5793e280 am 785a99a6: am a4894246: Merge "Animates AbsSeekBar progress movement from key presses." into lmp-dev 
* commit '785a99a61ea5c93687e997eac0184494047f8dc8':
  Animates AbsSeekBar progress movement from key presses.
 2014-07-25 16:45:38 +00:00
Jon Miranda
572dfe7aaa am a4894246: Merge "Animates AbsSeekBar progress movement from key presses." into lmp-dev 
* commit 'a489424661f7a01b3e5b44df3b376c7f61a0020c':
  Animates AbsSeekBar progress movement from key presses.
 2014-07-25 16:42:15 +00:00
Andrew Lee
3a6046ac7c am 933807c1: am 430f25e4: Merge "Add VideoCall and VideoCall.Listener as an inner classes of Call." into lmp-dev 
* commit '933807c1d756b714192db0f72626b47adac9b590':
  Add VideoCall and VideoCall.Listener as an inner classes of Call.
 2014-07-25 16:14:47 +00:00
Andrew Lee
1ca8a77b66 am 430f25e4: Merge "Add VideoCall and VideoCall.Listener as an inner classes of Call." into lmp-dev 
* commit '430f25e4706ae95e49396d38f2c9832c578ae57a':
  Add VideoCall and VideoCall.Listener as an inner classes of Call.
 2014-07-25 16:10:22 +00:00
Kenny Guy
1d2ea07adc am 2afedc82: am 0f151df6: Add method to launch settings app details page. 
* commit '2afedc8225d754f8422c96ae04988d7ce9891aa9':
  Add method to launch settings app details page.
 2014-07-25 16:06:47 +00:00
Kenny Guy
19b485069e am 0f151df6: Add method to launch settings app details page. 
* commit '0f151df6882c6d1c8c83b0ca3166fac30f43e3b1':
  Add method to launch settings app details page.
 2014-07-25 16:02:38 +00:00
Kenny Guy
466d203c4f Add method to launch settings app details page. 
Add a method to LauncherApps to allow launchers to
show application details for an app in a managed profile.

Bug: 16371359
Change-Id: I23acb4365c09e4a7b9fa742ae6fc7e04434f45aa
 2014-07-25 15:59:51 +00:00
Derek Sollenberger
a516131434 am cd5af52b: am 9a5d0cad: Move Canvas.h to a new location so that it can be shared with HWUI. 
* commit 'cd5af52bae5b4aa45b1dc30f24ab31ed4c64bd6b':
  Move Canvas.h to a new location so that it can be shared with HWUI.
 2014-07-25 15:47:44 +00:00
Derek Sollenberger
d32ad91f78 am 9a5d0cad: Move Canvas.h to a new location so that it can be shared with HWUI. 
* commit '9a5d0cad1c7341f432a3c608e250d4c412d949a3':
  Move Canvas.h to a new location so that it can be shared with HWUI.
 2014-07-25 15:44:14 +00:00
Derek Sollenberger
cae05e0b4c Move Canvas.h to a new location so that it can be shared with HWUI. 
Bug: 15672762
Change-Id: Ia59e986cd4034e16b2e54e8d594e6941a6c9fb1b
 2014-07-25 11:39:37 -04:00
Narayan Kamath
288db80e04 am 1f4a1c58: am a589b67f: Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev 
* commit '1f4a1c5823e11dd48a0d076ab88f33a32aef478a':
  Handle apps that share a UID with the system_server correctly.
 2014-07-25 14:42:14 +00:00
Narayan Kamath
fb646b61ab am a589b67f: Merge "Handle apps that share a UID with the system_server correctly." into lmp-dev 
* commit 'a589b67f56083e86f2ff6d71542c787aa2a25132':
  Handle apps that share a UID with the system_server correctly.
 2014-07-25 14:38:03 +00:00
Narayan Kamath
4e070e33dd am bbe9386f: am 77075e88: Merge "Handle renderscript apps in the system partition correctly." into lmp-dev 
* commit 'bbe9386f0f639bde8422c1d02ea9c614cd396117':
  Handle renderscript apps in the system partition correctly.
 2014-07-25 14:37:59 +00:00
Narayan Kamath
c022535589 am 77075e88: Merge "Handle renderscript apps in the system partition correctly." into lmp-dev 
* commit '77075e88b12a6126b5cc3fb2dda60c32dcc378ee':
  Handle renderscript apps in the system partition correctly.
 2014-07-25 14:33:54 +00:00
George Mount
ad135c9fe6 am 244219fc: am af8966a6: Fix Monkey NPE. 
* commit '244219fc8035fa40235f29c41a44125a20fd76fc':
  Fix Monkey NPE.
 2014-07-25 14:08:01 +00:00
George Mount
f47c706630 am af8966a6: Fix Monkey NPE. 
* commit 'af8966a67f561186e453df659759e3f700730158':
  Fix Monkey NPE.
 2014-07-25 14:03:27 +00:00
George Mount
51c014843a Fix Monkey NPE. 
Bug 16135577

Change-Id: If2ea474fd9ca9232fec325deed0e9b9b806595f6
 2014-07-25 13:59:37 +00:00
Dan Sandler
03ac3fca52 am edef8374: am 4e3b5947: Do not colorize bare notification icons in the overflow. 
* commit 'edef837497f951cec3c6656b1f410fb5b152263a':
  Do not colorize bare notification icons in the overflow.
 2014-07-25 13:47:08 +00:00
Dan Sandler
ed5c79f4c8 am 4e3b5947: Do not colorize bare notification icons in the overflow. 
* commit '4e3b59470cc2581c251e229154d1107689f893aa':
  Do not colorize bare notification icons in the overflow.
 2014-07-25 13:43:12 +00:00
Dan Sandler
13b8159e90 Do not colorize bare notification icons in the overflow. 
Change-Id: I3377a7d6024e495172a5ccefde1beaa46ec88283
 2014-07-25 13:36:37 +00:00
Adrian Roos
d7cbe1a548 am 70299838: am 8e09d6fb: Merge "Remove brightness dialog timeout" into lmp-dev 
* commit '702998388ad5d3e77055809b13936a4d99e80d24':
  Remove brightness dialog timeout
 2014-07-25 13:24:58 +00:00
Jorim Jaggi
4459b7c7ef am 2cfbb96e: am f9453e20: Synchronize album fade away with Keyguard dismissal 
* commit '2cfbb96ed1c1dd744c32455fde3589cb810f8643':
  Synchronize album fade away with Keyguard dismissal
 2014-07-25 13:20:39 +00:00
Adrian Roos
311dd744af am 8e09d6fb: Merge "Remove brightness dialog timeout" into lmp-dev 
* commit '8e09d6fbe95db69e11b1a4f3300aacef7e055984':
  Remove brightness dialog timeout
 2014-07-25 13:19:21 +00:00
Adrian Roos
7a2cb299a0 am f8a01f5f: am 6468d5c2: Merge "Restart trust agents when updated or when they are dead" into lmp-dev 
* commit 'f8a01f5f011dc9e1324fc2b54fcf4d9e0695da37':
  Restart trust agents when updated or when they are dead
 2014-07-25 13:16:13 +00:00
Jorim Jaggi
69ea13ec66 am f9453e20: Synchronize album fade away with Keyguard dismissal 
* commit 'f9453e2010492a9733e697a46d4f6f9070a6ab97':
  Synchronize album fade away with Keyguard dismissal
 2014-07-25 13:15:07 +00:00
Adrian Roos
17a313cd53 am 6468d5c2: Merge "Restart trust agents when updated or when they are dead" into lmp-dev 
* commit '6468d5c216e45b33830e00b754258e910154393e':
  Restart trust agents when updated or when they are dead
 2014-07-25 13:10:45 +00:00
Jorim Jaggi
4e0880e395 Synchronize album fade away with Keyguard dismissal 
Change-Id: I7aaa6213f6070f0db14131a248a62b317309a3bf
 2014-07-25 13:09:37 +00:00
Nicolas Prevot
a8f076e8c3 am e7469eca: am c50bbc02: Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev 
* commit 'e7469eca60b76931830e3679788865ee8582add1':
  Migrate extras to ClipData for image/video capture intents.
 2014-07-25 12:26:24 +00:00
Hector Dearman
0af97f073b am 31b9e23a: am 21b90a9d: Merge "Add documentation for CookieManager defualts" into lmp-dev 
* commit '31b9e23a1e9aa11c830cda0e2556d25a045c1d88':
  Add documentation for CookieManager defualts
 2014-07-25 12:26:20 +00:00
Kenny Guy
f6bed3f55b am fae68ecc: am 8717bd4e: Change getBadgedLabelForUser to use CharSequence 
* commit 'fae68ecc5d906ca53f181e18f31fc7ce5203ae58':
  Change getBadgedLabelForUser to use CharSequence
 2014-07-25 12:25:39 +00:00