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

175622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miao Wang
f8a69f562b am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni" 
* commit '2ef9955c827e0348a65b4f787e206925f4663197':
  [RenderScript] Remove duplicate include in jni
 2015-03-19 20:49:15 +00:00
Eric Gilmore
3e90fa5908 am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '680f36a88ff1c43e928066122505ec05c50d9942':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:46:28 +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
Miao Wang
2ef9955c82 Merge "[RenderScript] Remove duplicate include in jni" 2015-03-19 20:35:56 +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
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
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
Rich Slogar
a29a34b054 am efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'efa9bfac1aaa558ed6856581c424d6ffc507b0b1':
  docs: proguard help update
 2015-03-19 20:11:09 +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
Jason Sams
d8e891f474 am f75e4ca3: Merge "Make it harder to leak contexts" 
* commit 'f75e4ca3945f4c299dc26f4c95d8d18ec74f41bb':
  Make it harder to leak contexts
 2015-03-19 18:52:47 +00:00
Andres Morales
e39ab2ae9c am f342e5e0: am ca0391eb: am c8f952ce: Write correct checksum when formatting partition 
* commit 'f342e5e0ae85fa7929e9b2eb4213bbc85dbcf61c':
  Write correct checksum when formatting partition
 2015-03-19 18:41:31 +00:00
Jason Sams
f75e4ca394 Merge "Make it harder to leak contexts" 2015-03-19 18:38:16 +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
Elliott Hughes
0634fba591 am 89da4ca6: Merge "Remove unused printapk.cpp." 
* commit '89da4ca67d5bf6c35ea76f074cb2caa3d542740e':
  Remove unused printapk.cpp.
 2015-03-19 18:19:54 +00:00
Elliott Hughes
89da4ca67d Merge "Remove unused printapk.cpp." 2015-03-19 18:06:17 +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
Mathieu Chartier
05844d573f am b7d997a7: Merge "Revert "Change jit properties to be debug properties"" 
* commit 'b7d997a7b79c233869fdd5ad18b013caad4a7236':
  Revert "Change jit properties to be debug properties"
 2015-03-19 16:58:59 +00:00
Mathieu Chartier
b7d997a7b7 Merge "Revert "Change jit properties to be debug properties"" 2015-03-19 16:44:59 +00:00
Alex Klyubin
d71f548f48 am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute." 
* commit '4177b8cbbfa239d68a9283124638d9399a5dd0de':
  Add app-level usesCleartextTraffic manifest attribute.
 2015-03-19 16:21:40 +00:00
Alex Klyubin
4177b8cbbf Merge "Add app-level usesCleartextTraffic manifest attribute." 2015-03-19 16:10:20 +00:00
Elliott Hughes
e519c81f35 Remove unused printapk.cpp. 
This is one of the few remaining users of libzipfile, but doesn't get built.
Not worth porting to libziparchive.

Change-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c
 2015-03-19 09:03:41 -07:00
Vinod Krishnan
7a2df74b11 am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev 
* commit '3f782ad156d337c7c6c542696ddc67ae82fa7a84':
  Make Theme.Micro point to Theme.Material
 2015-03-19 09:42:46 +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
e711412302 am bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs 
* commit 'bf6b1e00f1981061f5a11dffdb2cf2bf58792e4a':
  docs: updated Auto training landing page
 2015-03-19 05:56:57 +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
fd711bec49 am 99842c00: am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs 
* commit '99842c0018241ca3c0ec05c88dc57a21f24fb405':
  Revert "Doc change: add docs for SafetyNet API."
 2015-03-19 05:38:48 +00:00
Joe Fernandez
635d302a9d am af1fd4e2: 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 lm 
* commit 'af1fd4e28de6cb39647a52e66887584e3a44991d':
  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:38:41 +00:00
Joe Fernandez
e6bd00f399 am a3c2ca61: 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 'a3c2ca6140b5a460fbd96618b2065066d8c2ccc8':
  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:38:34 +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
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