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

118587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oskar Grönqvist
2c4254e476 Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value 
To be able to customize the "WiFi scan always available"
setting we need to set a default value.

Change-Id: I3673f2613ab9b6a947aed7e29d4cc876140c2180
 2014-01-14 17:57:21 +09: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
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
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
David Christie
d8dfa528b8 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 '301b1facb23d148efebd7a2aa5c174cd7c04cc6f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:59:20 -08:00
David Christie
301b1facb2 am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '26c6c15f54231c154bb2f7febb053d034cbe40c5':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:56:27 -08:00
David Christie
26c6c15f54 am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'b3c96c4c57cb97924f828ea917b1c4d63b2c9d00':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:53:27 -08:00
David Christie
b3c96c4c57 am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:50:18 -08:00
David Christie
1d151607fb am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '4013c4b18ccc66b510f4cdb222d4c04597975843':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:46:35 -08:00
David Christie
4013c4b18c am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:43:47 -08:00
David Christie
42d7a0bff5 am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a7d13fabd6184e411215e9a841cf16097f1a5127':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:41:48 -08:00
David Christie
a7d13fabd6 am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '45aaa377c5d090003c6cf5fb54fff856a0807c4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:40:04 -08:00
David Christie
45aaa377c5 am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:36:49 -08:00
David Christie
a1b89310d5 am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:33:39 -08:00
quddusc
d77cb626ca docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature. 
Change-Id: I6d9e07e724b2eb02bec7c43344872459e3104fa4
 2014-01-13 11:20:39 -08:00
Daniel Cashman
e29ff50aae am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit 'fe7bfdd384f199668ba9b1b751194e06cbb50b3b':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 11:02:15 -08:00
Daniel Cashman
fe7bfdd384 am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit 'af2f2f767a1673f10a2b44f913832cacefda341b':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 11:00:02 -08:00
Daniel Cashman
af2f2f767a am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '9ecadd7cedc492faef163a314713caddbd5da39a':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:56:41 -08:00
Daniel Cashman
9ecadd7ced am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:53:31 -08:00
Daniel Cashman
0d30e07d23 am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '3d5ea26fbb92b1b780cd9763c0731288f48341a3':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:52:54 -08:00
Daniel Cashman
6f34b9382f am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:50:03 -08:00
Daniel Cashman
3d5ea26fbb am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '4503409a477f3fca2eb60e4105d804069d7b0cad':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:49:40 -08:00
Daniel Cashman
3238d0d9f9 Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 2014-01-13 18:44:45 +00:00
Daniel Cashman
4503409a47 Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 2014-01-13 18:44:38 +00:00
Jeff Sharkey
6d3700b394 am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '47235e8b5ce6c622a1182933404cf5a17fcd35dc':
  MountService listeners can not be unregistered
 2014-01-13 10:42:07 -08:00
Jeff Sharkey
47235e8b5c am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '90cadb35156829ff1d6b7066409596da38fc70e1':
  MountService listeners can not be unregistered
 2014-01-13 10:37:51 -08:00
Jeff Sharkey
90cadb3515 Merge "MountService listeners can not be unregistered" 2014-01-13 18:35:32 +00:00
Ashok Bhat
39029b2990 Make YuvToJpegEncoder more JNI compliant 
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: I4015138921cc18ecae52daaa6710b3c9efd68e87
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-13 15:14:05 +00:00
Ashok Bhat
0c10cc6052 AArch64: Use long for pointers in graphics/PathMeasure 
For storing pointers, long is used in
android/graphics/PathMeasure class, 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: I4599a9d5f7dcf9c39838db96d9033059114d3a49
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-13 14:50:50 +00:00
Narayan Kamath
d0ec6d8c50 am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'bc2a449a615b30efb81a1a0082a1bb0db515d0f5':
  Fix preference puts with "null" values.
 2014-01-13 05:01:44 -08:00
Narayan Kamath
bc2a449a61 am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f':
  Fix preference puts with "null" values.
 2014-01-13 04:32:19 -08:00
Narayan Kamath
cb4d3ec1ea Merge "Fix preference puts with "null" values." 2014-01-13 12:29:41 +00:00
Dirk Dougherty
717b63ab58 Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore. 
Change-Id: I3bae04277329ff0db38ba530c0d61ddbac675d19
 2014-01-11 16:03:53 -08:00
Jason Sams
411350dd23 am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" 
* commit '739ae9b3b77458b4c77f799cba56dc68d65ab424':
  Fix a JNI local reference leak in MediaDrm
 2014-01-10 16:50:54 -08:00
Jason Sams
739ae9b3b7 am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" 
* commit '868173a53f0d1059408b049f30af3402d5b0de64':
  Fix a JNI local reference leak in MediaDrm
 2014-01-10 16:48:12 -08:00
Jason Sams
868173a53f Merge "Fix a JNI local reference leak in MediaDrm" 2014-01-11 00:42:20 +00:00
Craig Mautner
275817929a am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit '54f991375a9c7c2a256e6aec7d4a223be8d36b39':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-10 16:03:06 -08:00
Craig Mautner
54f991375a am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit '3747768bde14ff9db96279830f07602ec50544cc':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-10 15:59:59 -08:00
Craig Mautner
3747768bde Merge "Fix visibility of multiple non-fullscreen activities." 2014-01-10 23:55:44 +00:00