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

118489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jeff Sharkey
6fba240b72 am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '6d3700b394c7137ef95580d35223a402a3dd0e7c':
  MountService listeners can not be unregistered
 2014-01-13 18:44:43 +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
f588d2dff2 am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'd0ec6d8c505142a51a6c1bfb3637d4a49aa05f32':
  Fix preference puts with "null" values.
 2014-01-13 13:04:28 +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
1ae1763355 am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" 
* commit '411350dd234dcf246adf884b66751ac1def64cc0':
  Fix a JNI local reference leak in MediaDrm
 2014-01-11 00:54:18 +00: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
5d8936b4cf am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen activities." 
* commit '275817929a584b220a54b5c8206c7a7425da16d4':
  Fix visibility of multiple non-fullscreen activities.
 2014-01-11 00:05:55 +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
Dirk Dougherty
cc33c350df am d45a76db: am d8849489: am ccc5ca14: Doc change: dashboard update. 
* commit 'd45a76db36854b4dc58f7c717f557311a9603f7a':
  Doc change: dashboard update.
 2014-01-10 23:15:13 +00:00
Dirk Dougherty
d45a76db36 am d8849489: am ccc5ca14: Doc change: dashboard update. 
* commit 'd8849489a79a6b46996f3192b92d5089521e9341':
  Doc change: dashboard update.
 2014-01-10 15:09:33 -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
881e1fe733 am dc622f5e: am 36788815: 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 'dc622f5e117031b494de750ab7729b07aa787243':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 21:37:40 +00:00
David Christie
dc622f5e11 am 36788815: 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 '36788815be0e9c2d12cdc44d186f0cbe6a9e7122':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:34:13 -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