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

118783 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
Wei Wang
86b3fa6090 BLE peripheral mode (3/4): Add peripheral mode API. 
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
 2014-01-13 17:53:48 -08:00
Dianne Hackborn
6873e17d4b am 305c61a1: am 3a8a8ddd: am 8c359bf4: am c174288d: Fix issue #12031685: Sticky Service Breakage in Android 4.4.1 
* commit '305c61a1c6816549b225719518df5b29a17f0f42':
  Fix issue #12031685: Sticky Service Breakage in Android 4.4.1
 2014-01-14 01:53:07 +00:00
Zhihai Xu
82e95573c7 NPE in BluetoothSocket.write() 
If calling connect succeed, we should not see this NPE.
An IOException may happen after call BluetoothSocket.connect.
If you still call write after the IOException,
you will get this NPE.
add NPE protection for possible wrong calling sequence from application,
To make bluetoothSocket more error-tolerant.

bug:12104154
Change-Id: I7fa4e847b500ca9b9d2a43df432f31a1bb016c0a
 2014-01-13 17:52:13 -08: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
595ddb8911 am 03d65b4b: am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs 
* commit '03d65b4b8a0893d57c5bb00f7f8d02a7869ff12c':
  docs: Fixed typo.
 2014-01-14 00:30:18 +00:00
Ricardo Cervera
15de74b64b am cfbc332f: am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos. 
* commit 'cfbc332f6f63de09a126b45fa78e093a92eef09e':
  docs: Fixed typos.
 2014-01-14 00:30:11 +00: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
Craig Mautner
5c44c51c2a Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev 2014-01-14 00:00:00 +00: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
Jim Miller
cd655f12e7 Merge "Fix broken homekey on devices without keyguard" into klp-modular-dev 2014-01-13 22:25:03 +00:00
David Christie
e769a04069 am cf77c059: 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 'cf77c05988dee8410d9235b9818dbcdf01c48f4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 21:10:05 +00: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
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
Craig Mautner
529cbcd0af Use new DisplayManager flag to show own content only. 
Change-Id: I8b2666e5849e57b5eb2ed73ed3d5e39da2dbd55d
 2014-01-13 12:55:33 -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
Craig Mautner
04a0ea60ac Retain stacks even if they are empty. 
Previously stacks would be removed when the last ActivityRecord was
removed. This causes problems for ActivityContainers which persist and
permit activities to be launched into an empty stack.

Change-Id: Ia79ac65d17c42eff3a7b1321980c21b29996001b
 2014-01-13 12:51:26 -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
71007e5d54 am 555b8ebf: am e29ff50a: 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 '555b8ebfd6e4ee1f60752459061f6dae2fd45981':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:10:08 +00:00
Daniel Cashman
555b8ebfd6 am e29ff50a: 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 'e29ff50aae302ef05b0592e4bab6b3090a59254a':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:05:49 +00: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
94827c3484 am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '21a801d0885d65f128b84a593140b07fd0d4e980':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:00:37 +00: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
21a801d088 am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '0d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 18:57:19 +00: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