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

112717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dianne Hackborn
8e535cec2e am dfafaffe: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 
* commit 'dfafaffe8601a3483e8da8f32bd4c754fecb88c1':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put
 2013-09-05 13:40:42 -07:00
Dianne Hackborn
dfafaffe86 Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev 2013-09-05 20:38:55 +00:00
Kenny Root
b91773bce1 Add argument to binder call to check key types 
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.

Bug: 10600582
Change-Id: I9fe9e46b9ec9cfb2f1246179b2c396216b2c1fdb
 2013-09-05 13:27:00 -07:00
Dianne Hackborn
f691359724 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: Ib261a40619c43f7ea2e686057c0702fb5461d843
 2013-09-05 13:21:24 -07:00
Victoria Lease
531dfc4573 DroidSans -> NotoSans for {Devanagari,Tamil,Thai} 
Bug: 7672029
Change-Id: I3b7278841ea1934b459f972d5acd99277e8f6db8
 2013-09-05 13:13:58 -07:00
Svetoslav
0951d5986c am 4063e9e7: am 0cdc24a2: Merge "Bug fixes in the print dialog" into klp-dev 
* commit '4063e9e73283307344cfe22ce762c4998b16e99f':
  Bug fixes in the print dialog
 2013-09-05 12:43:36 -07:00
Adam Powell
1d5ac31c0d am f094655c: am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into klp-dev 
* commit 'f094655c804e3983a538b7bc28266b173ea5c78b':
  Add View#cancelPendingInputEvents API
 2013-09-05 12:43:32 -07:00
Deepanshu Gupta
7913427d68 am e68c111e: (-s ours) am 0851945a: am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit 'e68c111e3834bd3f075a3fe747187de5d89d5761':
  Fix text rendering
 2013-09-05 12:43:27 -07:00
Svetoslav
4063e9e732 am 0cdc24a2: Merge "Bug fixes in the print dialog" into klp-dev 
* commit '0cdc24a2fb5268241cf16c6b28a4a3b58965a2c8':
  Bug fixes in the print dialog
 2013-09-05 12:39:37 -07:00
Adam Powell
f094655c80 am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into klp-dev 
* commit 'a73c3a54886c302cc72e469d27603ef6bb92a6a1':
  Add View#cancelPendingInputEvents API
 2013-09-05 12:39:34 -07:00
Svetoslav
0cdc24a2fb Merge "Bug fixes in the print dialog" into klp-dev 2013-09-05 19:38:24 +00:00
Adam Powell
a73c3a5488 Merge "Add View#cancelPendingInputEvents API" into klp-dev 2013-09-05 19:37:51 +00:00
Deepanshu Gupta
dd442d9bf6 am a9f35ab9: (-s ours) am b6545562: am 97c88368: am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit 'a9f35ab9042e30b15102de6f736827710945faea':
  Fix layout rendering for RTL locales
 2013-09-05 12:26:32 -07:00
Deepanshu Gupta
e68c111e38 am 0851945a: am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit '0851945a72e10e1d31aafa459f7e69cdf7087bee':
  Fix text rendering
 2013-09-05 12:03:20 -07:00
Deepanshu Gupta
a9f35ab904 am b6545562: am 97c88368: am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit 'b654556213513885ff5be05d4d2808e34d50233e':
  Fix layout rendering for RTL locales
 2013-09-05 12:03:17 -07:00
Deepanshu Gupta
0851945a72 am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit 'b50de4951aaea6d6f01432dc17b7c5de778a2e71':
  Fix text rendering
 2013-09-05 12:00:58 -07:00
Deepanshu Gupta
b654556213 am 97c88368: am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit '97c88368e0036665507c8cd84c71d26953784c85':
  Fix layout rendering for RTL locales
 2013-09-05 12:00:54 -07:00
Deepanshu Gupta
b50de4951a am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit 'dd4efc22c736973ecfa1b7b4af9e71f971dd48b3':
  Fix text rendering
 2013-09-05 11:58:59 -07:00
Deepanshu Gupta
97c88368e0 am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit 'c78d173b730dcfdf107e6ac2bc959d459fe3eedd':
  Fix layout rendering for RTL locales
 2013-09-05 11:58:54 -07:00
Deepanshu Gupta
dd4efc22c7 am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit '3a762d8bfbe6b2d4066bc5cc90301063c19976c4':
  Fix text rendering
 2013-09-05 11:52:48 -07:00
Deepanshu Gupta
c78d173b73 am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit '68411471083abd7a7713483b5cd40f394387b7b3':
  Fix layout rendering for RTL locales
 2013-09-05 11:52:42 -07:00