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

115765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Dirk Dougherty
d8849489a7 am ccc5ca14: Doc change: dashboard update. 
* commit 'ccc5ca144c2d6e21df5118870d0a3f3c65055686':
  Doc change: dashboard update.
 2014-01-10 23:06:16 +00:00
Dirk Dougherty
ccc5ca144c Doc change: dashboard update. 
Change-Id: Ic65cd8d6bf2435fa3efd73f3337c462c02a752ed
 2014-01-10 15:00:16 -08:00
David Christie
36788815be am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:30:36 -08:00
David Christie
a4bd593155 am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'c454bbe805bd6ed096ec6b4b811c4e4b67a86225':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:27:26 -08:00
David Christie
c454bbe805 am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'b15429a6853472207c2a4aefd22dd009e851edb7':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:24:05 -08:00
David Christie
b15429a685 am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '503c5a32a4e718282b88f73e602c09e1bda49aec':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:18:58 -08:00
David Christie
a87bdc1f8f Merge commit 'bc39746e' into manualmerge 2014-01-10 13:17:01 -08:00
David Christie
503c5a32a4 am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'ea47cb6763d36fcc916c63dd764b48b4b6f1ff01':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:14:04 -08:00
David Christie
ea47cb6763 am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:10:12 -08:00
David Christie
bf6cecc21f am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '5716e4bfb980c8bab01b51944c1e715d76d59b1d':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:05:35 -08:00
David Christie
5716e4bfb9 am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '776b3956a9742b868b037dffd2b24c17b2dfa0e6':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:02:48 -08:00
David Christie
776b3956a9 am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '7f4d82932c812fbac1d99ceaf9462b7a763f5231':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:00:09 -08:00
David Christie
7f4d82932c am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '6826387e50f9f272d53ca1f725f573bbddcdf5c1':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:55:24 -08:00
David Christie
bc39746ee9 am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '8e0c7768c87014fef277df84c737dd6c37fb8866':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:53:41 -08:00
Joe Fernandez
c6735c069c docs: Added note to Support Library Setup page: mediarouter to appcompat dependency 
The v7 mediarouter support library depends on a couple of styles that are located
in the v7 appcompat library. This dependency requires developers to have both
libraries imported in their Eclipse workspace and to set up a library dependency
between the mediarouter to the appcompat library.

See Stackoverflow for issue and fix: http://goo.gl/xQI0Iw

Staging: http://joefernandez2.mtv.corp.google.com:8208/tools/support-library/setup.html#libs-with-res

Change-Id: Ifc7fa3dfcf9dfdb7faac7d2695a9988d49440c7d
 2014-01-07 23:46:07 +00:00
Deepanshu Gupta
5ad7c183f3 Fix the measurement of text bounds. 
Bug: 12366230
Change-Id: I203b678363dc7b688c744503ee10216baca658a9
 2014-01-07 12:07:45 -08:00