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

118266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
quddusc
e8ae214c31 am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit 'f40111731581f03dc1b447b432331b3415fb87b9':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 10:00:53 -08:00
quddusc
f401117315 am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit '31573d45933886237dd6414978486b79a4dd4f9f':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 17:57:27 +00:00
quddusc
31573d4593 Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 2014-01-15 17:55:22 +00:00
Marco Nelissen
cb15fb6041 am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:22:55 -08:00
Marco Nelissen
0d4916f19f am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'c3036a12467395465b86e6935af8aa500c1b128d':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:19:52 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Ashok Bhat
075e9a19ce AArch64: Use long for pointers in media classes 
For storing pointers, long is used in media classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-15 13:09:27 +00:00
Scott Main
f12b3fd617 Doc change: add Drive API feature page. 
fix link text on several pages

Change-Id: I141e5b2cafe8c433861fa4f51aa9fc3843e7fba1
 2014-01-14 18:47:34 -08:00
quddusc
e8df6f4d53 docs: Fixed typo in InstrumentationTestRunner page. 
Bug: 11386360

Change-Id: I7626fe6fe1a22e223a8929ed3e5178c8df8966c9
 2014-01-14 12:47:34 -08:00
quddusc
65e3350cd2 am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs 
* commit '916277e415e6c8186b79dfe929114d36f80d9ee0':
  docs: Removed stray link. Bug: 11773486
 2014-01-14 12:35:29 -08:00
quddusc
9bc3bde793 am 5e5c9833: am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs 
* commit '5e5c9833f533bb55964c7e981feacf191b63f09f':
  docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
 2014-01-14 12:35:24 -08:00
quddusc
9714cbdf4a am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs 
* commit '21627274a0b1ddbf68599a3b5fe4bfa751885ddf':
  docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
 2014-01-14 12:35:18 -08:00
quddusc
bcc83d0196 am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs 
* commit '7c865524048695f5dc471e6a357a142cf60495a7':
  docs: Fixed typo in IAB training doc. Bug: 10807741
 2014-01-14 12:35:14 -08:00
quddusc
e53c32a0aa am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 
* commit 'c61e6bc613db3d0d5ce7661bda3fe51ecc2f9726':
  docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
 2014-01-14 12:35:08 -08:00
quddusc
916277e415 am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs 
* commit 'e7eb5996c2cca421eb7d28325918db18044fe4f7':
  docs: Removed stray link. Bug: 11773486
 2014-01-14 20:32:08 +00:00
quddusc
5e5c9833f5 am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs 
* commit 'cec51d6620c1e46c8e4b52f492ff4ed6d75b85a6':
  docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
 2014-01-14 20:32:04 +00:00
quddusc
21627274a0 am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs 
* commit 'cc29a17056e4ae656182bf2fb36536b25ab4fcae':
  docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
 2014-01-14 20:32:00 +00:00
quddusc
7c86552404 am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs 
* commit '64231d01dead59752ff230570cbe07f206d5c9ec':
  docs: Fixed typo in IAB training doc. Bug: 10807741
 2014-01-14 20:31:55 +00:00
quddusc
c61e6bc613 am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 
* commit '72159ab085c48f4451ccf44a436e8b2122716fd4':
  docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
 2014-01-14 20:31:51 +00:00
quddusc
e7eb5996c2 Merge "docs: Removed stray link. Bug: 11773486" into klp-docs 2014-01-14 20:30:03 +00:00
quddusc
cec51d6620 Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs 2014-01-14 20:29:46 +00:00
quddusc
cc29a17056 Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs 2014-01-14 20:29:28 +00:00
quddusc
64231d01de Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs 2014-01-14 20:29:14 +00:00
quddusc
72159ab085 Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 2014-01-14 20:28:56 +00:00
John Spurlock
b343635909 am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'e05190eae74be57dd517bb5afbccf901543329bf':
  Docfixes: three typos and escape */*.
 2014-01-14 11:54:25 -08:00
John Spurlock
e05190eae7 am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit '85f98508366e8422f71553d2a5e682eb804c7419':
  Docfixes: three typos and escape */*.
 2014-01-14 19:50:38 +00:00
John Spurlock
85f9850836 Merge "Docfixes: three typos and escape */*." into klp-docs 2014-01-14 19:48:13 +00:00
quddusc
f23fb5d199 docs: Added link to in-app billing testing API guide and removed misleading statement. 
Bug: 9436754

Change-Id: I7f08fbbd6c917a84ad1634ee956cd9c5112d3715
 2014-01-14 10:43:23 -08:00
Ricardo Cervera
afe90d8056 am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 
* commit '7dde7879a4561a3ec9ffc48921a4d074e40aa74e':
  docs: Fixed typo in AlertDialog code snippet.
 2014-01-14 09:39:29 -08:00
Ricardo Cervera
7dde7879a4 am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 
* commit '1a21c16b2bd74c022d6b83177027b78992dc42b5':
  docs: Fixed typo in AlertDialog code snippet.
 2014-01-14 17:36:07 +00:00
Ricardo Cervera
1a21c16b2b Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 2014-01-14 17:34:21 +00:00
Marco Nelissen
13249411b1 am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" 
* commit 'a9045d24a73faa6aa1e8ad204a1e14a53711a824':
  Add NULL check in updateProxyConfig
 2014-01-14 08:15:13 -08:00
Marco Nelissen
a9045d24a7 am 337aa376: Merge "Add NULL check in updateProxyConfig" 
* commit '337aa376c09bb97a48afe075b4018f030445534f':
  Add NULL check in updateProxyConfig
 2014-01-14 08:11:39 -08:00
Marco Nelissen
337aa376c0 Merge "Add NULL check in updateProxyConfig" 2014-01-14 16:08:18 +00:00
Narayan Kamath
80b0496abe am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit '2db26788ab367f08cb5378d77e22e8939e7a28c2':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 02:16:39 -08:00
Narayan Kamath
2db26788ab am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit 'e71afc2ea72e98c4631e79cad65f678090da87d3':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 02:13:45 -08:00
Narayan Kamath
e71afc2ea7 Merge "Revert "Hide AssetInputStream.getAssetInt."" 2014-01-14 10:09:50 +00:00
Narayan Kamath
b1bd1fe7fd Revert "Hide AssetInputStream.getAssetInt." 
This reverts commit 842d44ec1765e01f4a37af99cc1935b4d0399758.

Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
 2014-01-14 10:08:45 +00:00
Narayan Kamath
271b28ac31 am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit '8021316010fb4bd18a29751949eb2cda66199b6e':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 01:51:14 -08:00
Narayan Kamath
8021316010 am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit 'ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 01:48:37 -08:00
Narayan Kamath
ac8ccc3c18 Merge "Hide AssetInputStream.getAssetInt." 2014-01-14 09:45:41 +00:00
Narayan Kamath
842d44ec17 Hide AssetInputStream.getAssetInt. 
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.

(cherry picked from commit f8f09a15a409f373f22aa475bb0defd264088e4f)

Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
 2014-01-14 09:34:00 +00:00
Dianne Hackborn
3a8a8ddd7c am 8c359bf4: am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1 
* commit '8c359bf473b4c31407613dbc1473ba49b0297898':
  Fix issue #12031685: Sticky Service Breakage in Android 4.4.1
 2014-01-13 17:45:16 -08:00
Dianne Hackborn
8c359bf473 am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1 
* commit 'c174288d345d4a80b326b12ff4c10a6c99570997':
  Fix issue #12031685: Sticky Service Breakage in Android 4.4.1
 2014-01-13 17:42:01 -08:00
Dianne Hackborn
c174288d34 Fix issue #12031685: Sticky Service Breakage in Android 4.4.1 
Got a little too aggressive about cleaning up service state; need to
avoid removing services from an app until we are in the second loop
doing the final cleanup, otherwise we can leave services around with
restarting their process.

Also fix crash:

W/BinderNative(  667): Uncaught exception from death notification
W/BinderNative(  667): java.lang.ArrayIndexOutOfBoundsException: length=0; index=0
W/BinderNative(  667): 	at android.util.ArraySet.valueAt(ArraySet.java:301)
W/BinderNative(  667): 	at com.android.server.am.ActiveServices.killServicesLocked(ActiveServices.java:2069)
W/BinderNative(  667): 	at com.android.server.am.ActivityManagerService.cleanUpApplicationRecordLocked(ActivityManagerService.java:12412)
W/BinderNative(  667): 	at com.android.server.am.ActivityManagerService.handleAppDiedLocked(ActivityManagerService.java:3596)
W/BinderNative(  667): 	at com.android.server.am.ActivityManagerService.appDiedLocked(ActivityManagerService.java:3744)
W/BinderNative(  667): 	at com.android.server.am.ActivityManagerService$AppDeathRecipient.binderDied(ActivityManagerService.java:1024)
W/BinderNative(  667): 	at android.os.BinderProxy.sendDeathNotice(Binder.java:493)
W/BinderNative(  667): 	at dalvik.system.NativeStart.run(Native Method)
 2014-01-13 17:10:03 -08:00
Ricardo Cervera
7a8acfa68e docs: Fixed typo in AlertDialog code snippet. 
Bug-ID:10797361

Review URL:
http://quixote.mtv.corp.google.com:8001/guide/topics/ui/dialogs.html#AlertDialog

Change-Id: If93e140d624c2a4360a27bfae630f19fce24d7ab
 2014-01-13 16:44:19 -08:00
Ricardo Cervera
9865216eb1 am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs 
* commit '18bf3b1df67f219d70e6cba828216a47d92e3dc5':
  docs: Fixed typo.
 2014-01-13 16:23:24 -08:00
Ricardo Cervera
f4494e6c8f am faca5e3c: am ac5ad7b9: docs: Fixed typos. 
* commit 'faca5e3c917a6197b380eb5d2b51893b5d689946':
  docs: Fixed typos.
 2014-01-13 16:23:19 -08:00
Ricardo Cervera
18bf3b1df6 am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs 
* commit '5e15e1abe8a14f95ab40cf8181ac2a4f8b5d76e2':
  docs: Fixed typo.
 2014-01-14 00:19:55 +00:00
Ricardo Cervera
faca5e3c91 am ac5ad7b9: docs: Fixed typos. 
* commit 'ac5ad7b9e488a967ffee56fd1b168c010c1d62e8':
  docs: Fixed typos.
 2014-01-14 00:19:51 +00:00