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

118740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
5b5b4aa21f resolved conflicts for merge of cb7cdd50 to klp-dev-plus-aosp 
Change-Id: Iba01a6617d4922ec2827b0465095695028c20681
 2014-03-06 13:57:33 -08:00
Eric Laurent
b4545ce96c am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3':
  Fix RemoteController synchronization mode
 2014-03-06 20:05:33 +00:00
Dianne Hackborn
529ae9e127 am 12caef78: am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '12caef7836a21fa20d052e4868df92e23b930cf6':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 20:05:29 +00:00
Santos Cordon
ff96593ede am abbd963e: am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit 'abbd963e3c50f5241f9bf668b8b806c42a202621':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 20:05:23 +00:00
Eric Laurent
eac19754ca am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '617e715a40e2867c0b30d1bae38c20815ee30071':
  Fix RemoteController synchronization mode
 2014-03-06 19:49:55 +00:00
Dianne Hackborn
12caef7836 am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '71ab245a0d7830791cb89ec9130313620a1ee029':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 19:49:52 +00:00
Santos Cordon
abbd963e3c am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 19:49:46 +00:00
Eric Laurent
617e715a40 Merge "Fix RemoteController synchronization mode" into klp-dev 2014-03-06 19:21:26 +00:00
Nick Kralevich
a7d81a7104 am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels." 
* commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708':
  Map SELinux log levels to Android log levels.
 2014-03-06 18:38:51 +00:00
Dianne Hackborn
71ab245a0d Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 2014-03-06 18:29:19 +00:00
Dianne Hackborn
76c59a89e9 Fix issue #11536426 DO NOT MERGE 
Permission denied when trying to launch an activity from a notification

We don't remove pending intents when updating an app, which is necessary
to keep app widgets and other things working.  However, when uninstalling
an app, we should clear out all of its pending intents.

Change-Id: I95067b31098115b5a7b127766fd093750063bbb8
 2014-03-06 10:12:57 -08:00
Baligh Uddin
a8cf5f87b0 am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd010cf12c796cf83c760df037916e5572ce55868':
  Import translations. DO NOT MERGE
 2014-03-06 17:57:01 +00:00
Baligh Uddin
d010cf12c7 am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '221849b6d68704340754200492329f19cef7979b':
  Import translations. DO NOT MERGE
 2014-03-06 17:41:09 +00:00
Santos Cordon
4c8c27ed73 Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
bug: 12175514

Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
(cherry picked from commit b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)
 2014-03-06 17:27:59 +00:00
Jean-Michel Trivi
4b0f155457 Fix RemoteController synchronization mode 
Fix erroneous argument check in RemoteController syncrhonization
  mode setter..

Bug 12189375

Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10
 2014-03-06 09:22:26 -08:00
Baligh Uddin
221849b6d6 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-06 17:00:46 +00:00
Santos Cordon
a04a1fd103 am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit 'a45bb4be2f12144754aa62a5d44c39db08b21c92':
  Update permission description string.
 2014-03-06 02:14:46 +00:00
Santos Cordon
a45bb4be2f am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit '77a60f006f8b7260207043529d3ed004db301bd5':
  Update permission description string.
 2014-03-06 01:56:50 +00:00
Santos Cordon
77a60f006f Merge "Update permission description string." into klp-dev 2014-03-06 01:54:20 +00:00
Michael Wright
e4a7179278 am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
  Revert Japanese special case fallback keys.
 2014-03-06 00:56:59 +00:00
Michael Wright
4448f9d7ad am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.
 2014-03-06 00:53:22 +00:00
Michael Wright
c5dea68e98 Merge "Revert Japanese special case fallback keys." into klp-dev 2014-03-06 00:50:15 +00:00
Fabrice Di Meglio
6c3a45d7df am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 
* commit '57f8a4b4ed48ae3e2488bb3bafcd40137c71ec18':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
 2014-03-06 00:35:40 +00:00
Fabrice Di Meglio
e1190a994e am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 
* commit 'cb6dcd7af2d015b7a3d49f1224936241747bcb43':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
 2014-03-06 00:35:36 +00:00
Fabrice Di Meglio
57f8a4b4ed am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 
* commit '1ff2df6194148f487ccb014a7c5302fa8ffe2571':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
 2014-03-06 00:32:30 +00:00
Fabrice Di Meglio
cb6dcd7af2 am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 
* commit '2b58a29f825e6442d8767a36adaf1770b86d5725':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
 2014-03-06 00:32:27 +00:00
Fabrice Di Meglio
1ff2df6194 Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 2014-03-06 00:29:35 +00:00
Fabrice Di Meglio
2b58a29f82 Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 2014-03-06 00:29:20 +00:00
Dirk Dougherty
f55616cd8b Update permission description string. 
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit 08d7c2861fee205a314c3847ab5f5894617a233b)
 2014-03-05 23:21:41 +00:00
Dianne Hackborn
ea391750fb am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit '5e578e17f4392d1baf41772ab45347bc8bcccc38':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:11:07 +00:00
Dianne Hackborn
5e578e17f4 am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit '40a26004810623f02546a31cb0ce49a0502bdff7':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:07:45 +00:00
Dianne Hackborn
40a2600481 Issue #13308712: Add --checkin to package manager dump. 
Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233
 2014-03-05 11:00:54 -08:00
Fabrice Di Meglio
25d9ce4058 Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE 
- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)

Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783
 2014-03-05 18:42:56 +00:00
Fabrice Di Meglio
b3670c54e6 Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE 
- force TextView internal layout recreation when its TextDirection is changed

Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
(cherry picked from commit 22228fec05129af9684f95d7a13aeff92144bd90)
 2014-03-05 18:41:36 +00:00
Robert Greenwalt
1c8ba7e551 am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit 'bad3a9e66fb103ec96ea89ce9eff7270333d5926':
  Only apply tcp buffer sizes for default net
 2014-03-05 18:31:18 +00:00
Robert Greenwalt
bad3a9e66f am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit '2d1e8c49582fb91df0a05a778c228fc1cd89e026':
  Only apply tcp buffer sizes for default net
 2014-03-05 18:27:03 +00:00
Robert Greenwalt
2d1e8c4958 Merge "Only apply tcp buffer sizes for default net" into klp-dev 2014-03-05 18:23:56 +00:00
Baligh Uddin
8c0dff620a Import translations. DO NOT MERGE 
Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
Auto-generated-cl: translation import
 2014-03-05 09:58:27 -08:00
Christopher Tate
c45ff35f21 am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 
* commit '1efc6e52d65389463ad52c32df02d68493df0f48':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 00:57:22 +00:00
Christopher Tate
a6c5915876 am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:57:18 +00:00
Christopher Tate
1efc6e52d6 am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 
* commit '1d13f13deac644bddbae8a1f92642074a32d7a6c':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 00:54:17 +00:00
Christopher Tate
f63ae644a8 am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '1e995c76485f8a7477177886890b834c31e8d1a6':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:54:14 +00:00
Christopher Tate
1d13f13dea Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 2014-03-05 00:51:33 +00:00
Christopher Tate
1e995c7648 Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev 2014-03-05 00:51:04 +00:00
John Spurlock
c6ecac77cf am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev 
* commit '38f81ccc768958b1a9100cb2caa93ec3aedd9b5e':
  Volume panel should not clear system ui flags.
 2014-03-04 19:15:56 +00:00
John Spurlock
c3371eb5d4 am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev 
* commit '49eac16ec00ea63feaafc137a1d313fcb4374b36':
  Show hideycling for non-primary users.
 2014-03-04 19:15:53 +00:00
John Spurlock
0a3bc3c4d2 am 2cc271eb: am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 
* commit '2cc271ebbccc251ef96edee16b79a22fcf856244':
  Allow lights-out + bar icon dimming on low-end devices.
 2014-03-04 19:15:49 +00:00
John Spurlock
38f81ccc76 am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev 
* commit 'fee6f69e8321c3f94c2b341fe483f7b1f6534169':
  Volume panel should not clear system ui flags.
 2014-03-04 19:12:40 +00:00
John Spurlock
49eac16ec0 am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev 
* commit '8ec59a72889f7da0c13119977ca62ada8a1498e0':
  Show hideycling for non-primary users.
 2014-03-04 19:12:37 +00:00
John Spurlock
2cc271ebbc am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 
* commit 'd36ede391619e6fc8a1553f5b2f4b33b3603cd65':
  Allow lights-out + bar icon dimming on low-end devices.
 2014-03-04 19:12:33 +00:00