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

164181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryce Lee
8320cf2de3 Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 2015-03-19 21:24:52 +00:00
Joe Fernandez
8ca83e0504 am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '0362d6e0c836cd48beb928f053d97dcc3961c110':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:49:52 +00:00
Joe Fernandez
1e81b070f7 am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "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 'e41abf4a304675bda37de7b796258f7f322d61ea':
  RESUBMIT: "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 20:49:48 +00:00
Joe Fernandez
5c1a3ab421 am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'd7df900a80f4c7af1f16efc0a8bcf044a2a7ff4d':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:49:41 +00:00
Joe Fernandez
0362d6e0c8 am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:42:36 +00:00
Joe Fernandez
e41abf4a30 am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "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 '43929db6487f295c4bca1a499a5299da77ad2161':
  RESUBMIT: "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 20:42:30 +00:00
Joe Fernandez
d7df900a80 am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:42:23 +00:00
Eric Gilmore
680f36a88f am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '66e529aa34034d044c496c330ba89026ee293253':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:38:49 +00:00
Joe Fernandez
bb777ef40d am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'b88bce219abf7fcad50ac105183bd79da0b9893c':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:35:09 +00:00
Joe Fernandez
43929db648 am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "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 'f761e4c20ee63873043522990487ecd15bb18966':
  RESUBMIT: "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 20:35:05 +00:00
Joe Fernandez
a06c8ff08e am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit '36b2c1609d17317bb9d3977e46ada21275f54d65':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:34:59 +00:00
Eric Gilmore
66e529aa34 am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '1f07cfb6011e3d30847f0e7012bcef9e93c0fa5f':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:32:03 +00:00
Joe Fernandez
b88bce219a am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'c773358d599d9dd7716db88b0699a7903d64ad9b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:28:54 +00:00
Joe Fernandez
f761e4c20e am d91167e8: am 80f947c8: Merge "RESUBMIT: "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 'd91167e8ceda64809e9afd73ac184dc319a276f5':
  RESUBMIT: "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 20:28:45 +00:00
Joe Fernandez
36b2c1609d am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:28:40 +00:00
Bryce Lee
9cd2e62612 Fix wrong intent being passed in PhoneWindowManager. 
When starting going home for Wear, the intent extra indicating the
intent is coming from a button press must be set. This was lost during
a merge conflict resolution.

Bug: 19832892
Change-Id: I6b77757b34f99dd754194448fdea9165690fc90f
 2015-03-19 13:27:26 -07:00
Eric Gilmore
1f07cfb601 am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '0fdeefbdad81e92a5fdb5acc7f92fc92a28654b4':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:24:57 +00:00
Joe Fernandez
c773358d59 am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:21:47 +00:00
Joe Fernandez
d91167e8ce am 80f947c8: Merge "RESUBMIT: "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 '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
  RESUBMIT: "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 20:21:43 +00:00
Joe Fernandez
bacdd2b8de am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:21:37 +00:00
Eric Gilmore
0fdeefbdad am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit 'cf1586d3fb4e3232aa4f4679eb389bcf89415b15':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:17:22 +00:00
Joe Fernandez
dd461b2988 Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 2015-03-19 20:16:32 +00:00
Joe Fernandez
80f947c8b4 Merge "RESUBMIT: "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 20:16:21 +00:00
Joe Fernandez
ef7d80811d Merge "RESUBMIT: "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 20:16:05 +00:00
Eric Gilmore
cf1586d3fb am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit 'e43a64e3336548094571885944afc28792e24fa0':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:10:55 +00:00
Eric Gilmore
e43a64e333 Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 2015-03-19 20:05:50 +00:00
Rich Slogar
efa9bfac1a am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'e3d92a205b5c1bfde3ceff1fe4ca9a62cc5cb4fc':
  docs: proguard help update
 2015-03-19 20:02:31 +00:00
Rich Slogar
e3d92a205b am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit '983dd1a9d1dc5a6d0bc72fcbc87b5194df09c048':
  docs: proguard help update
 2015-03-19 19:54:30 +00:00
Rich Slogar
983dd1a9d1 am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'b569ec3cc1366e3e3caa96fa40a9fc14ed9c6121':
  docs: proguard help update
 2015-03-19 19:47:03 +00:00
Rich Slogar
b569ec3cc1 am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'd76aa14cf401ca794b585b2312528121c651a537':
  docs: proguard help update
 2015-03-19 19:39:27 +00:00
Rich Slogar
d76aa14cf4 am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'd58858427e102bec7ebe1d2a8ce418529924a68c':
  docs: proguard help update
 2015-03-19 19:10:06 +00:00
Rich Slogar
d58858427e Merge "docs: proguard help update" into lmp-docs 2015-03-19 19:04:05 +00:00
Andres Morales
f342e5e0ae am ca0391eb: am c8f952ce: Write correct checksum when formatting partition 
* commit 'ca0391eb524b0adad79160c48682c4edf6f49ed2':
  Write correct checksum when formatting partition
 2015-03-19 18:35:07 +00:00
Andres Morales
ca0391eb52 am c8f952ce: Write correct checksum when formatting partition 
* commit 'c8f952ce9f9cadc0d38745e455c0a6388bc68a47':
  Write correct checksum when formatting partition
 2015-03-19 18:27:54 +00:00
Rich Slogar
f062b94cc2 docs: proguard help update 
b/19383794
b/19417644

Change-Id: I454015fb85601dbd31d3cb364eaa6d0adee0c764
 2015-03-19 10:55:27 -07:00
Andres Morales
c8f952ce9f Write correct checksum when formatting partition 
OEM unlock enabled bit is not computed in the checksum,
causing OEM Unlocking to be disabled after the second
reboot.

Bug: 19829441
Change-Id: I100bf5d3958b89323ee35b9e97b19c162209fcd7
 2015-03-19 17:18:01 +00:00
Joe Fernandez
b8eea908c6 RESUBMIT: "Doc change: add docs for SafetyNet API."" 
This reverts commit 1fac8d4800c4cdd0c357b17ad0a271f8f3b4bee0.

Change-Id: Idf3dba195f3e0ccf27103b9f7d7a67cec8c917b0
 2015-03-19 16:39:43 +00:00
Joe Fernandez
61bfeafdef RESUBMIT: "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 2a867108951807e467dbfe0fcd4cc48a4d7f4191.

Change-Id: Ib91bf437e952e8a91f20afc63332b88952527ca4
 2015-03-19 16:38:05 +00:00
Joe Fernandez
7786917f4a RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" 
This reverts commit c0e9ac455568b2d82d191388708a281bdb376cc9.

Change-Id: Iccc75ead90c92602b25da70e13bcdd55a6d129b6
 2015-03-19 16:36:02 +00:00
Vinod Krishnan
3f782ad156 Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev 2015-03-19 09:36:37 +00:00
Joe Fernandez
bf6b1e00f1 am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs 
* commit 'ebaf79018b5bcfbe83f5877d5360a1c0d46d0b97':
  docs: updated Auto training landing page
 2015-03-19 05:52:21 +00:00
Joe Fernandez
ebaf79018b am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs 
* commit 'cbdfa09fc56995c8c99e8684b8c52e4f9d247a50':
  docs: updated Auto training landing page
 2015-03-19 05:44:33 +00:00
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
99842c0018 am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs 
* commit '7e7f3658b90da46ae8b44577420ebd6ee0e9ffa1':
  Revert "Doc change: add docs for SafetyNet API."
 2015-03-19 05:31:11 +00:00
Joe Fernandez
af1fd4e28d am 7a7f8927: 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 '7a7f89271e7fc1a6c3c881a1cb56dc88d9958f7a':
  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:31:04 +00:00
Joe Fernandez
a3c2ca6140 am f038ffd7: 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 'f038ffd7992c5e0c46fb1de6b42e747b1999bfdf':
  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:30:58 +00:00
Joe Fernandez
7e7f3658b9 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:43 +00:00
Joe Fernandez
7a7f89271e 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:37 +00:00
Joe Fernandez
f038ffd799 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:32 +00:00