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

161178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
cbdfa09fc5 am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs 
* commit 'f8b9e92b647f247d38e02ed3cf66bdc8cf08bc1c':
  docs: updated Auto training landing page
 2015-03-19 05:37:09 +00:00
Joe Fernandez
f8b9e92b64 am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs 
* commit 'ae4542578ef50122bb3cd3a8334a20314957e318':
  docs: updated Auto training landing page
 2015-03-19 05:31:20 +00:00
Joe Fernandez
11cf6c1169 am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs 
* commit '2e0f6b10e2d0a9d1dc8321e4aaedde148a87bc44':
  Revert "Doc change: add docs for SafetyNet API."
 2015-03-19 05:24:54 +00:00
Joe Fernandez
bb0ce124cf am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs 
* commit '1e474aeeb55a3d2ff79b6803813ba36469f3a463':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
 2015-03-19 05:24:51 +00:00
Joe Fernandez
98b20e0a8a am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs 
* commit '6f3caae9f016666815d6bfc7daa9db13d13b6cef':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
 2015-03-19 05:24:46 +00:00
Joe Fernandez
ae4542578e am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs 
* commit 'b67971b512d95d5d9befb9d95417f9c3d8cb3a44':
  docs: updated Auto training landing page
 2015-03-19 05:23:30 +00:00
Joe Fernandez
b67971b512 Merge "docs: updated Auto training landing page" into lmp-docs 2015-03-19 05:19:22 +00:00
Joe Fernandez
2e0f6b10e2 am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs 
* commit '9bb7e2e77c6b8dd3d729cddf23194142cf1035e4':
  Revert "Doc change: add docs for SafetyNet API."
 2015-03-19 05:18:15 +00:00
Joe Fernandez
1e474aeeb5 am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs 
* commit '1eba366dce4b38e849e9faaf99c5bd3f7de2d6a8':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
 2015-03-19 05:18:01 +00:00
Joe Fernandez
6f3caae9f0 am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs 
* commit '055ec1f94f90bd3f87e0b48d5438953420b22c3f':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
 2015-03-19 05:17:54 +00:00
Joe Fernandez
9bb7e2e77c am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs 
* commit 'f23167fc8faa03f16a5597acb463393a5ec14af5':
  Revert "Doc change: add docs for SafetyNet API."
 2015-03-19 05:11:27 +00:00
Joe Fernandez
1eba366dce am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs 
* commit '507cfedde978dea45cc646fd391c5a12ff55e9cd':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
 2015-03-19 05:11:23 +00:00
Joe Fernandez
055ec1f94f am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs 
* commit 'f7497b46366054274eca1a81e7f74b0e61d7ffe5':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
 2015-03-19 05:11:18 +00:00
Joe Fernandez
66d14b5733 docs: updated Auto training landing page 
Change-Id: I407681892071b82523c5533539c777f77a8dd429
 2015-03-18 22:07:52 -07:00
Joe Fernandez
f23167fc8f am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs 
* commit '4189bd99572a8dfa4a84e05a03a6d87d794d2e36':
  Revert "Doc change: add docs for SafetyNet API."
 2015-03-19 05:05:08 +00:00
Joe Fernandez
507cfedde9 am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs 
* commit '5a5e6a37011795135b7ebbaf4ae5645d72f8f147':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
 2015-03-19 05:05:04 +00:00
Joe Fernandez
f7497b4636 am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs 
* commit 'ceb10eac8ec07be00a3eca68ea1be68cb5ebc78c':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."
 2015-03-19 05:04:58 +00:00
Wei Wang
986a97e20a Merge "Make Opportunistic Scan API public." into m-wireless-dev 2015-03-19 05:02:09 +00:00
Joe Fernandez
4189bd9957 Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs 2015-03-19 05:00:46 +00:00
Joe Fernandez
5a5e6a3701 Merge "Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs 2015-03-19 05:00:04 +00:00
Joe Fernandez
ceb10eac8e Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs 2015-03-19 04:58:18 +00:00
Joe Fernandez
1fac8d4800 Revert "Doc change: add docs for SafetyNet API." 
Reason: Android Auto needs to release ahead of Orla which is delayed.
This change is in the way, right now, but will be re-submitted.

This reverts commit 11e80575660e81d7e053d7fce604bf421ca2f3ce.

Change-Id: I6661e1e780ce8aee9bdaed82fcff4f96fc3349e7
 2015-03-19 04:55:05 +00:00
Joe Fernandez
2a86710895 Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." 
This reverts commit b2a6185e259c2e9bbb48d729563263cf7234a837.

Change-Id: I64f49cba3a87fe0f6a9db12a68d8a0064810a1d8
 2015-03-19 04:51:17 +00:00
Joe Fernandez
c0e9ac4555 Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." 
This reverts commit 180b835480b113e497268243a12cb2c244d9559e.

Change-Id: Ibcefe65a1a7829b8b424763aba636300665a7f7b
 2015-03-19 04:49:40 +00:00
Bart Sears
1418624714 am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 
automerge: dd985c2

* commit 'dd985c21dd4f5957e8d6e052976623d127e8f090':
  Prevent activities from being started during setup wizard.
 2015-03-19 02:58:59 +00:00
Dan Sandler
a14b2c42b2 am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 
automerge: 1ac28e1

* commit '1ac28e18b417b286f05a44712acb1d5f00b56fb3':
  Avoid crashing on corrupted notifications.
 2015-03-19 02:58:41 +00:00
Rich Slogar
03f5584ac0 am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
automerge: 455b64c

* commit '455b64c57f06bace3f85dce1a30064bd66dd2385':
  docs: downloads for sdk 24.1.2
 2015-03-19 02:58:33 +00:00
Pierre Vandwalle
af3f1c995c Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev 
automerge: 7c39808

* commit '7c398083319bbd1ad51d23cb307cfc3ac9091c3a':
  export API to disable autojoin scan initial implementation
 2015-03-19 02:58:01 +00:00
Joe Fernandez
264c0a037d am 5994206b: am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit '5994206b99584560bc8fdd14111d592f83746b45':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-19 02:51:56 +00:00
Joe Fernandez
658bd99de2 am cd9cd187: am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit 'cd9cd18783e658c9ef43349705599c5cbcd98f43':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-19 02:51:52 +00:00
Joe Fernandez
2f4f41e12d am 348a8b85: am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs 
* commit '348a8b856d99e503dc3765bbe3b32f2edc2f049f':
  Doc change: add docs for SafetyNet API.
 2015-03-19 02:51:48 +00:00
Quddus Chong
a0c9b538ca am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs 
* commit 'e5856e6b2ce1cb6a4c15d1ae5ee786ac1ec2012b':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.
 2015-03-19 02:51:44 +00:00
Quddus Chong
3367fd2aae am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit '48612f9d4b1699483b22226096d0dbeb1cb23817':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-19 02:51:38 +00:00
Joe Fernandez
5994206b99 am cdf13080: am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit 'cdf130800b46ddd8d3bf88e7788b2c6de3e228dc':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-19 02:37:23 +00:00
Joe Fernandez
cd9cd18783 am e31c9048: am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit 'e31c90483147bdf73247edfdeafe1e4d0549543d':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-19 02:37:18 +00:00
Joe Fernandez
348a8b856d am d2484a8a: am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs 
* commit 'd2484a8a53017ac6137d9caec3d287d75c0868eb':
  Doc change: add docs for SafetyNet API.
 2015-03-19 02:37:00 +00:00
Quddus Chong
e5856e6b2c am c63471ad: am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs 
* commit 'c63471ade6a136259f1bdc88beb5f10268f26cb0':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.
 2015-03-19 02:36:56 +00:00
Quddus Chong
48612f9d4b am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit '5192ac8d0652e0b0fc442325af393d34d30dfba7':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-19 02:36:50 +00:00
Andrew Solovay
3852906014 am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit 'b08f20787c793c79d2031a34824dbfa5be4a602c':
  docs: Removed sentence fragments.
 2015-03-19 01:17:26 +00:00
Andrew Solovay
7a98f832dc am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit 'cf34a6d1a19853fe156bf14abcb40a01a380de79':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 01:17:17 +00:00
Andrew Solovay
8973063698 am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit 'a01417485279a486df31f8666b037b6f15d7f935':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 01:17:11 +00:00
Andrew Solovay
b08f20787c am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '3f7f78c6518f93b694bd868d406c755e2469584c':
  docs: Removed sentence fragments.
 2015-03-19 00:55:12 +00:00
Andrew Solovay
cf34a6d1a1 am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 00:55:08 +00:00
Andrew Solovay
a014174852 am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '42f966c9df6ed4e7903e87ad557d63ed81da2986':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 00:55:01 +00:00
Deepanshu Gupta
4f3b8527e3 Update JRE for runConfigurations. 
The intensive bridge tests use some libraries that are compiled with
1.7. All other tests are capable of running on JRE 1.6. Thus, change the
run configurations appropriately.

Change-Id: Iaea0fef2e58877578b36ac2ffe0b20b3a55f572c
 2015-03-18 17:03:15 -07:00
Vinit Deshpande
ad25bb8925 More fixes to get passpoint working 
Change-Id: If8639bb0fd3bdaad7ee09217a9152c1695cb9354
 2015-03-18 17:00:48 -07:00
Deepanshu Gupta
6092c044aa Fix project settings. [DO NOT MERGE] 
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
(cherry picked from commit 7b2cae5072321da5d67f9d12dea10871326f3477)
 2015-03-18 16:59:49 -07:00
Joe Fernandez
cdf130800b am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit 'ed6579811f466db1e5e4058508c71e412472e71e':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-18 23:54:30 +00:00
Joe Fernandez
e31c904831 am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit '462dc7b9ca508a6f61bb8dd494b67aa0d80eb57e':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-18 23:54:22 +00:00
Eric Gilmore
f1598d1852 Changes for a quick, pre-migration bug sprint: 
Bug: 19679070, 19716684, 19680472.
Change-Id: I14ba1cf53ea42cd7739793fd9873e40e4a2ee6a0
 2015-03-18 16:53:47 -07:00