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

118324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
quddusc
ee1b0bfd64 am 9714cbdf: am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs 
* commit '9714cbdf4aaa303e8b85faae022eefe83996e29e':
  docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
 2014-01-14 20:39:19 +00:00
quddusc
1746de3389 am bcc83d01: am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs 
* commit 'bcc83d01966dac7fb1d9ac45ae119ad44ee2c471':
  docs: Fixed typo in IAB training doc. Bug: 10807741
 2014-01-14 20:39:14 +00:00
quddusc
76a6dfafa1 am e53c32a0: am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 
* commit 'e53c32a0aa6ccb1bd177ff3fa3335c5b58ca5919':
  docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
 2014-01-14 20:39:09 +00: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
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
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
cce06eda6b am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'b34363590953e4efd70168cdf03386d1e469a548':
  Docfixes: three typos and escape */*.
 2014-01-14 19:57:02 +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
Ricardo Cervera
82ec095474 am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 
* commit 'afe90d80563bf6e236f7be6d6312f269a1919cb8':
  docs: Fixed typo in AlertDialog code snippet.
 2014-01-14 17:43:25 +00: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
e2c046fe7c am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" 
* commit '13249411b1c7dd4a476eec6905998217636a9344':
  Add NULL check in updateProxyConfig
 2014-01-14 16:18:02 +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
d34950cfc6 am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit '80b0496abeb03fe4c5086430218c7e4bcf3773db':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 10:20:33 +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
7f4dd91299 am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit '271b28ac3121e8bcc46e15bd15b13bfbc1e1be89':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 09:54:33 +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
305c61a1c6 am 3a8a8ddd: am 8c359bf4: am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1 
* commit '3a8a8ddd7cff03e39d4cb104ddb1d0401b6c7ede':
  Fix issue #12031685: Sticky Service Breakage in Android 4.4.1
 2014-01-14 01:47:15 +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
03d65b4b8a am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs 
* commit '9865216eb1c747b03cb60245772b196fc039a1b6':
  docs: Fixed typo.
 2014-01-14 00:26:41 +00:00
Ricardo Cervera
cfbc332f6f am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos. 
* commit 'f4494e6c8f7fc610795337a72d774e0f6cdc94ac':
  docs: Fixed typos.
 2014-01-14 00:26:36 +00: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
Ricardo Cervera
5e15e1abe8 Merge "docs: Fixed typo." into klp-docs 2014-01-14 00:18:23 +00:00
Ricardo Cervera
ac5ad7b9e4 docs: Fixed typos. 
bug:10732654
Change-Id: I5a580cf40e2670485f9c57e2376efd20bcf7b60d

Review URL: http://quixote.mtv.corp.google.com:8002/training/articles/security-tips.html
 2014-01-13 16:02:28 -08:00
Ricardo Cervera
8386e4aef9 docs: Fixed typo. 
bug:10797855
Change-Id: I2fdfa02046827a51eb7263e1892a04acfd4f0453

Review fix URL:
http://quixote.mtv.corp.google.com:8001/distribute/index.html
 2014-01-13 15:46:06 -08:00
David Christie
cf77c05988 am c809bd8b: am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'c809bd8b39c2ab8874d6eb2e7189ca9e72f4c9ed':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 21:06:24 +00:00
David Christie
c809bd8b39 am d8dfa528: am 301b1fac: am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'd8dfa528b86e734318159b6fa75814184fb02c9d':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 13:03:33 -08:00