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

177166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
14ba009a51 am 6b4c3fed: docs: Refactor Google Services pages for site redesign 
* commit '6b4c3fed885db4341076159dc549d6bdae4df02e':
  docs: Refactor Google Services pages for site redesign
 2015-05-15 20:24:58 +00:00
Joe Fernandez
6b4c3fed88 docs: Refactor Google Services pages for site redesign 
b/18225342 - removed outdated advertising ux recommendations
Redirects Change-Id: I669b2c7f216be28603594ae3f2909f50e7eaf60d

Change-Id: I50eada1885156c2abfcc0b1c2bd1f61bfc790e72
 2015-05-15 13:12:41 -07:00
Dirk Dougherty
7414f97a04 am efd254b2: Doc change: fix urls, remove obsolete image. 
* commit 'efd254b2f9246d4c259be7885ef344be745bc8bc':
  Doc change: fix urls, remove obsolete image.
 2015-05-15 03:22:53 +00:00
Dirk Dougherty
3519ddfe07 am de401c82: Doc change: More changes to distribute files, Google Services page update. 
* commit 'de401c82f58a9465593391fede942fe6ffd22ef1':
  Doc change: More changes to distribute files, Google Services page update.
 2015-05-15 03:17:37 +00:00
Dirk Dougherty
efd254b2f9 Doc change: fix urls, remove obsolete image. 
Change-Id: I61ec972b1df2c3211da6e21ee4e4ec3319d0d02b
 2015-05-14 20:14:34 -07:00
Dirk Dougherty
de401c82f5 Doc change: More changes to distribute files, Google Services page update. 
Change-Id: I047ff9165c5844075561b31e42f8127d8819aeb0
 2015-05-14 20:05:13 -07:00
Joe LaPenna
08bea4c90d am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev 
* commit '627f26817f752e0e1beb4185e778edc4501b4aa6':
  Wait for KEY_SLEEP UP event before calling goToSleep()
 2015-05-14 21:07:54 +00:00
Joe LaPenna
627f26817f Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev 2015-05-14 20:55:19 +00:00
Joe Fernandez
a90cb675a5 am a0f0b5bf: am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs 
* commit 'a0f0b5bfd8df9e0caa6848bc479f1ed3dc492efc':
  docs: Add weekly subscriptions and grace period information to IAB docs
 2015-05-14 15:53:44 +00:00
Joe Fernandez
a0f0b5bfd8 am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs 
* commit '574690b13c8f0d4835c6d86b8e26fc4c9b914037':
  docs: Add weekly subscriptions and grace period information to IAB docs
 2015-05-14 15:40:38 +00:00
Joe Fernandez
574690b13c Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs 2015-05-14 15:26:37 +00:00
John Reck
570b2052bb DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev 
Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1
 2015-05-14 07:38:11 -07:00
Joe Fernandez
7779379291 docs: Add weekly subscriptions and grace period information to IAB docs 
b/20351362

Change-Id: Ie1d9c928acbe3ae3846680d6fa4ff9e2fa049f84
 2015-05-13 21:03:13 -07:00
John Reck
951f23478d am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev 
* commit 'd955dceb4f38f214e62024e808b2b1a21be41940':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
 2015-05-14 01:05:47 +00:00
John Reck
d955dceb4f am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev 
* commit '862540cdb11a7128ae1fd670136f398645b4af7b':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
 2015-05-14 00:51:07 +00:00
John Reck
862540cdb1 Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev 2015-05-14 00:40:45 +00:00
John Reck
7238435e9b resolved conflicts for merge of e869835d to lmp-mr1-ub-dev 
Change-Id: Ia183cafb1aa19dcbb6e3bbefceecec5df29663da
 2015-05-13 17:16:31 -07:00
David Friedman
3ccf0caf01 am 7fc3b6c0: am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 
* commit '7fc3b6c00b55e15881d1f098666399b674a64e42':
  Docs: NDK r10e changes to publish to DAC.
 2015-05-13 23:46:36 +00:00
David Friedman
7fc3b6c00b am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 
* commit 'abd8d42225f58396abaef2cf0e8a604be111e683':
  Docs: NDK r10e changes to publish to DAC.
 2015-05-13 23:30:41 +00:00
David Friedman
abd8d42225 am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 
* commit 'f5d6156ce8e56eb92abcf046fd8ff5a9647d38ae':
  Docs: NDK r10e changes to publish to DAC.
 2015-05-13 23:16:41 +00:00
David Friedman
f5d6156ce8 Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs 2015-05-13 23:00:38 +00:00
David Friedman
3518e60498 Docs: NDK r10e changes to publish to DAC. 
Change-Id: Id178523df1d5524bb25d43e304591526e6488b92
 2015-05-13 15:42:32 -07:00
John Reck
e869835d6a am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev 
* commit 'a5b28b92b14d0949d43be6198fedc31872ad07f6':
  DO NOT MERGE Backport of limited jank-tracking metrics
 2015-05-13 22:07:15 +00:00
John Reck
a5b28b92b1 am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev 
* commit '69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0':
  DO NOT MERGE Backport of limited jank-tracking metrics
 2015-05-13 21:52:50 +00:00
John Reck
25607a6642 Revert "DO NOT MERGE Backport of limited jank-tracking metrics" 
This reverts commit 2614bd225f84f7a23e6b30fc6b47bede153e5f4c.

Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
 2015-05-13 21:42:28 +00:00
John Reck
69355eaa1c Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev 2015-05-13 21:42:13 +00:00
Fred Chung
ba64991757 am 09a8de75: Merge "docs: M Preview Program Overview page" into mnc-preview-docs 
* commit '09a8de7576945886b3de5ba70a8349629144ecd9':
  docs: M Preview Program Overview page
 2015-05-13 04:36:53 +00:00
Fred Chung
09a8de7576 Merge "docs: M Preview Program Overview page" into mnc-preview-docs 2015-05-13 04:28:53 +00:00
Dirk Dougherty
45fed51720 am 98794c01: Doc change: add new engagement and other distribute files. 
* commit '98794c012c45369484df7abfa0bdf065447aff58':
  Doc change: add new engagement and other distribute files.
 2015-05-13 04:06:00 +00:00
Dirk Dougherty
98794c012c Doc change: add new engagement and other distribute files. 
Change-Id: I1c80d134b6637db9f763b6a587cdc5817a66b9be
 2015-05-12 20:42:10 -07:00
Joe LaPenna
37d0c94f7a am 0cbd0cbd: Merge "Reduce display device log spam." into lmp-mr1-modular-dev 
* commit '0cbd0cbd138cdaa367d21f58d8a3fd36f1e73f69':
  Reduce display device log spam.
 2015-05-13 01:37:02 +00:00
Joe LaPenna
0cbd0cbd13 Merge "Reduce display device log spam." into lmp-mr1-modular-dev 2015-05-13 01:26:26 +00:00
Joe Fernandez
d575b1cfea docs: M Preview Program Overview page 
Change-Id: I3d5c06d8f5196d0fc1c216038221e6e31fc4f626
 2015-05-12 16:04:22 -07:00
Wei Liu
f0c4f0ddb6 am 3d76e2f3: Merge "Create GpsLocationProvider only if GPS is supported." into lmp-mr1-modular-dev 
* commit '3d76e2f35ae5e4557979c053aa35c3cf3b02f1c3':
  Create GpsLocationProvider only if GPS is supported.
 2015-05-12 19:06:06 +00:00
Wei Liu
3d76e2f35a Merge "Create GpsLocationProvider only if GPS is supported." into lmp-mr1-modular-dev 2015-05-12 18:54:11 +00:00
Rich Slogar
353232ecee am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs 
* commit 'b97afd418558fbe5cf37a17302a84a9d907490e6':
  docs: renderscript using gradle settings
 2015-05-12 17:36:17 +00:00
Rich Slogar
b97afd4185 am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs 
* commit 'a27dd186b265b58eae490d4e19ec11268ea54f12':
  docs: renderscript using gradle settings
 2015-05-12 17:20:10 +00:00
Rich Slogar
a27dd186b2 am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs 
* commit 'e78f136b1dbe11dc98c5699da24df49fd9dae795':
  docs: renderscript using gradle settings
 2015-05-12 17:05:40 +00:00
Rich Slogar
e78f136b1d Merge "docs: renderscript using gradle settings" into lmp-docs 2015-05-12 16:54:39 +00:00
Christopher Tate
7a4cfa58b1 am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers 
* commit '960cb4816c082eee52a221052a8e4232f0c0fb14':
  During early boot, send LOCALE_CHANGED only to registered receivers
 2015-05-12 16:06:43 +00:00
Christopher Tate
960cb4816c am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers 
* commit '613626b7488c5c35a4816804fbe8f837a7e30440':
  During early boot, send LOCALE_CHANGED only to registered receivers
 2015-05-12 15:53:04 +00:00
Christopher Tate
613626b748 am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers 
* commit 'afd883f8a3ee260a5505f83d628c0b789871c837':
  During early boot, send LOCALE_CHANGED only to registered receivers
 2015-05-12 15:39:12 +00:00
Joe Fernandez
f3c042045f am 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs 
* commit '13e39e3fd28544ff13639938455a8b7d593b835b':
  docs: studio 1.2.1.1 updates
 2015-05-12 04:09:42 +00:00
Jeff Hao
3da32f77fb am b1e9430a: am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs. 
* commit 'b1e9430a9d653937ae9ee2ae9c3e60860b30ba4d':
  Fix prototype for startMethodTracingSampling in profiling docs.
 2015-05-12 04:09:38 +00:00
Joe Fernandez
13e39e3fd2 am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs 
* commit 'c1e973477d635e08ab656bba3dbaf73927feaae8':
  docs: studio 1.2.1.1 updates
 2015-05-12 04:00:31 +00:00
Jeff Hao
b1e9430a9d am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs. 
* commit 'c5ced5d354678c6eaefbfab11035b4f05361264a':
  Fix prototype for startMethodTracingSampling in profiling docs.
 2015-05-12 04:00:24 +00:00
Joe Fernandez
c1e973477d Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs 2015-05-12 03:51:24 +00:00
Christopher Tate
afd883f8a3 During early boot, send LOCALE_CHANGED only to registered receivers 
Bug 20855725
Bug 19060618

Change-Id: I368660ecc6ee97a0c2a2f627fa1b09288bc92bd1
 2015-05-11 18:00:45 -07:00
Jeff Hao
c5ced5d354 Fix prototype for startMethodTracingSampling in profiling docs. 
Change-Id: I1bb48be7d154ef2d513c8f611c52a7c89414737c
(cherry picked from commit 3755c3d8bcc3d0f22eb7a775ec7a689feb7e1725)
 2015-05-12 00:43:47 +00:00
Wei Liu
5241a4cb55 Create GpsLocationProvider only if GPS is supported. 
The creation of GpsLocationProvider used to be inside the
GpsLocationProvider.isSupported() check.

https://googleplex-android-review.git.corp.google.com/#/c/288260/8/services/java/com/android/server/LocationManagerService.java
incorrectly moved it out.

b/20949616

Change-Id: I6ddd5be5a78f3156a4d5cfc4c756930558c3a8fc
 2015-05-11 17:39:49 -07:00