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

112745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
589759ff1d am 47361ddd: am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 
* commit '47361ddd0a507c687bc92b2d5baeae221a2df493':
  Apply implicit parent dependency when adding to PreferenceGroup
 2013-09-05 23:52:12 -07:00
Baligh Uddin
c106683094 am b3d69bf9: (-s ours) am ca5d413e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b3d69bf95eece256c05aea029a7f6ebf3f0fcd26':
  Import translations. DO NOT MERGE
 2013-09-05 23:52:07 -07:00
John Spurlock
27c68786ec am 773dd9d5: am bd847601: Merge "Remove opaque-on-interaction from nav bar." into klp-dev 
* commit '773dd9d58b42257c0d571b9d18236a2da99517ca':
  Remove opaque-on-interaction from nav bar.
 2013-09-05 23:52:01 -07:00
Christopher Tate
48103dc3f9 am abe49daf: am 8fe79f66: Merge "Turn off verbose wakeup-alarm stats" into klp-dev 
* commit 'abe49dafa0de201520589249083a5274d16b5287':
  Turn off verbose wakeup-alarm stats
 2013-09-05 23:51:56 -07:00
Lorenzo Colitti
db8b920fe9 am cf712202: am a7597d17: Merge "Add a function to replace all the link addresses." into klp-dev 
* commit 'cf71220223a4c4c7f2ac1e3340c8aa0cffa5f4cf':
  Add a function to replace all the link addresses.
 2013-09-05 23:51:53 -07:00
Baligh Uddin
55635416a4 Merge "Import translations. DO NOT MERGE" 2013-09-06 04:56:32 +00:00
Amith Yamasani
cd57b4950f am 3d27c9f9: am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev 
* commit '3d27c9f973b1dd35ed457785b452851316cdca8a':
  Remove unused APIs and rename others based on API review
 2013-09-05 17:33:19 -07:00
Alan Viverette
47361ddd0a am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 
* commit '0ccef4d00357275f3a492e10f4e88aaf4d9deec6':
  Apply implicit parent dependency when adding to PreferenceGroup
 2013-09-05 16:40:39 -07:00
Alan Viverette
0ccef4d003 Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev 2013-09-05 23:36:18 +00:00
Baligh Uddin
b3d69bf95e am ca5d413e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ca5d413eb978db22ec1c0f327e10b1ecf793792d':
  Import translations. DO NOT MERGE
 2013-09-05 16:33:45 -07:00
Baligh Uddin
e2a84af53e Merge "Import translations. DO NOT MERGE" 2013-09-05 23:28:36 +00:00
Baligh Uddin
ca5d413eb9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-05 23:28:26 +00:00
John Spurlock
773dd9d58b am bd847601: Merge "Remove opaque-on-interaction from nav bar." into klp-dev 
* commit 'bd8476016576124e82a23de864faf587299f6826':
  Remove opaque-on-interaction from nav bar.
 2013-09-05 16:22:35 -07:00
John Spurlock
bd84760165 Merge "Remove opaque-on-interaction from nav bar." into klp-dev 2013-09-05 23:20:00 +00:00
Christopher Tate
abe49dafa0 am 8fe79f66: Merge "Turn off verbose wakeup-alarm stats" into klp-dev 
* commit '8fe79f666dc1ba4b7820e412bb6aa8aea7d4b151':
  Turn off verbose wakeup-alarm stats
 2013-09-05 16:15:48 -07:00
Christopher Tate
8fe79f666d Merge "Turn off verbose wakeup-alarm stats" into klp-dev 2013-09-05 23:13:20 +00:00
Lorenzo Colitti
cf71220223 am a7597d17: Merge "Add a function to replace all the link addresses." into klp-dev 
* commit 'a7597d17714e8aa975a4692cd7e9656d8bfa2e2c':
  Add a function to replace all the link addresses.
 2013-09-05 16:06:12 -07:00
Lorenzo Colitti
a7597d1771 Merge "Add a function to replace all the link addresses." into klp-dev 2013-09-05 23:03:24 +00:00
Amith Yamasani
3d27c9f973 am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev 
* commit 'f1eebfc2cf47b7fb6ed8dfd06fb124f78ca3519e':
  Remove unused APIs and rename others based on API review
 2013-09-05 15:51:34 -07:00
Amith Yamasani
f1eebfc2cf Merge "Remove unused APIs and rename others based on API review" into klp-dev 2013-09-05 22:48:17 +00:00
Michael Wright
f8d80233ee am add9898c: am 7314eb08: Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev 
* commit 'add9898c7258563888dfda98e5de0faaaf32a201':
  Fix broken copy of kl/kcm/idc files to system image
 2013-09-05 15:36:38 -07:00
Michael Wright
add9898c72 am 7314eb08: Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev 
* commit '7314eb087f7318118fbf80827789a2626a8f66b5':
  Fix broken copy of kl/kcm/idc files to system image
 2013-09-05 15:33:55 -07:00
Michael Wright
7314eb087f Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev 2013-09-05 22:31:07 +00:00
Michael Wright
37ad207edc Fix broken copy of kl/kcm/idc files to system image 
Bug: 10633915
Change-Id: I244b85dc92d50bf8bdcfdf0fe32556eff8c5d279
 2013-09-05 15:27:32 -07:00
Dianne Hackborn
28d8be4a45 am 85e42829: am ea433f65: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 
* commit '85e428291d2a569d5d9af1d749b69e9a646064fc':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put
 2013-09-05 15:26:43 -07:00
Dianne Hackborn
a914574389 am 0421cfd2: am a6c767b2: Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev 
* commit '0421cfd2509766ddbd8cc789dc3ae831def9d003':
  Fix issue #10491028: iabv2 test apps that contain subscription SKUs...
 2013-09-05 15:26:40 -07:00
Dianne Hackborn
85e428291d am ea433f65: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 
* commit 'ea433f65dc7df7150ee77d65dc5552883c579dea':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put
 2013-09-05 15:24:01 -07:00
Dianne Hackborn
0421cfd250 am a6c767b2: Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev 
* commit 'a6c767b2d8239a80c53577ce59daea3001ab0bce':
  Fix issue #10491028: iabv2 test apps that contain subscription SKUs...
 2013-09-05 15:23:58 -07:00
Dianne Hackborn
6e8bd7234b am de93f124: am d67f18cf: Merge "Fix crash when dump() is called on ReceiverList" into klp-dev 
* commit 'de93f124bc6c76cdc75c980cb9e4b261db1ac040':
  Fix crash when dump() is called on ReceiverList
 2013-09-05 15:23:09 -07:00
Dianne Hackborn
ea433f65dc Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 2013-09-05 22:21:47 +00:00
Dianne Hackborn
a6c767b2d8 Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev 2013-09-05 22:20:55 +00:00
Dianne Hackborn
de93f124bc am d67f18cf: Merge "Fix crash when dump() is called on ReceiverList" into klp-dev 
* commit 'd67f18cf93679e1255f082a9121a3acda97bc0b5':
  Fix crash when dump() is called on ReceiverList
 2013-09-05 15:20:26 -07:00
Dianne Hackborn
eb5b70b85c Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put 
Locking of sSharedPrefs was bad -- it was using a per-context lock
instead of a static lock.

Change-Id: Ib7a929f9fd93f22cc817d32b53ac56523cdad75f
 2013-09-05 15:20:17 -07:00
Dianne Hackborn
d67f18cf93 Merge "Fix crash when dump() is called on ReceiverList" into klp-dev 2013-09-05 22:18:58 +00:00
Dianne Hackborn
8fd3751be2 Fix issue #10491028: iabv2 test apps that contain subscription SKUs... 
...crash on launch

You got some values in my keys!

Change-Id: I2636c72843e0c0900ccdd9acba771c1b61e70b39
 2013-09-05 15:10:20 -07:00
Kenny Root
b5e40a2555 am e968a479: am 040e68f0: Merge "Add argument to binder call to check key types" into klp-dev 
* commit 'e968a4796bc589fee6fb988cd14a86a538b4cf2c':
  Add argument to binder call to check key types
 2013-09-05 14:48:50 -07:00
Kenny Root
e968a4796b am 040e68f0: Merge "Add argument to binder call to check key types" into klp-dev 
* commit '040e68f02639048f76dcba2fcefbd43152697690':
  Add argument to binder call to check key types
 2013-09-05 14:45:10 -07:00
Svetoslav Ganov
c213bdea26 am 8f057bbf: am 56960fbd: Merge "Fixing some minor RTL bugs in print dialog" into klp-dev 
* commit '8f057bbf227eb3dfdf648426a902674a49303006':
  Fixing some minor RTL bugs in print dialog
 2013-09-05 14:45:10 -07:00
Svetoslav Ganov
8f057bbf22 am 56960fbd: Merge "Fixing some minor RTL bugs in print dialog" into klp-dev 
* commit '56960fbd39706278dbcb9d6ee95e16fa6eff6c6e':
  Fixing some minor RTL bugs in print dialog
 2013-09-05 14:41:35 -07:00
Kenny Root
040e68f026 Merge "Add argument to binder call to check key types" into klp-dev 2013-09-05 21:40:56 +00:00
Svetoslav Ganov
56960fbd39 Merge "Fixing some minor RTL bugs in print dialog" into klp-dev 2013-09-05 21:37:26 +00:00
Christopher Tate
95b58e251c Turn off verbose wakeup-alarm stats 
They have served their purpose.

Bug 10112313

Change-Id: Ia88c350c5b51bdd29f23f491b47e4188770b1ea0
 2013-09-05 14:31:52 -07:00
Jeff Sharkey
372750aa6f am c7b2112f: am 5d7acbd8: Merge "Filter roots based on supported MIME types." into klp-dev 
* commit 'c7b2112f1ba34013fafba69cd64e9b7aabc41fa6':
  Filter roots based on supported MIME types.
 2013-09-05 14:26:27 -07:00
Jeff Sharkey
c7b2112f1b am 5d7acbd8: Merge "Filter roots based on supported MIME types." into klp-dev 
* commit '5d7acbd8bedbccfd64d9d790d0b3c2492acdc219':
  Filter roots based on supported MIME types.
 2013-09-05 14:23:56 -07:00
Jeff Sharkey
5d7acbd8be Merge "Filter roots based on supported MIME types." into klp-dev 2013-09-05 21:19:39 +00:00
Victoria Lease
95cee73948 am 1add6cdf: am e0e4197c: Merge "DroidSans -> NotoSans for {Devanagari,Tamil,Thai}" into klp-dev 
* commit '1add6cdf76ed4f2ee122d895bb687505e23d1533':
  DroidSans -> NotoSans for {Devanagari,Tamil,Thai}
 2013-09-05 14:19:30 -07:00
Victoria Lease
1add6cdf76 am e0e4197c: Merge "DroidSans -> NotoSans for {Devanagari,Tamil,Thai}" into klp-dev 
* commit 'e0e4197c55a8a7f6896eec2794c4cd455736e46b':
  DroidSans -> NotoSans for {Devanagari,Tamil,Thai}
 2013-09-05 14:17:02 -07:00
Victoria Lease
e0e4197c55 Merge "DroidSans -> NotoSans for {Devanagari,Tamil,Thai}" into klp-dev 2013-09-05 21:15:01 +00:00
Jeff Sharkey
923396b772 Filter roots based on supported MIME types. 
Using flags to indicate supported types isn't very extensible, so
use newline-separated MIME types instead.

Bug: 10514613
Change-Id: I45641fc20b423b2a0bb2df7457c274f42aa6861a
 2013-09-05 13:58:04 -07:00
Dianne Hackborn
9bf60233bc am 8e535cec: am dfafaffe: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 
* commit '8e535cec2e172fc08e2d9c98bb3fb1c66e5552c7':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put
 2013-09-05 13:43:54 -07:00