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

185512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Gilmore
4496b0a539 am 3e90fa59: 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 '3e90fa590857e43f0ed86eac18f0b02afca44b88':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:54:31 +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
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
Rich Slogar
c259ba0390 am a29a34b0: am efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'a29a34b0540a895c75f6d516ec4cc9860be6253d':
  docs: proguard help update
 2015-03-19 20:17: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
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
db8cfd062e am d8e891f4: am f75e4ca3: Merge "Make it harder to leak contexts" 
* commit 'd8e891f474096c310f60ca6d2f737cdc0251003e':
  Make it harder to leak contexts
 2015-03-19 18:59:00 +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
2566dbde3f am e39ab2ae: am f342e5e0: am ca0391eb: am c8f952ce: Write correct checksum when formatting partition 
* commit 'e39ab2ae9c844d9f553f7214b5f80856b9389311':
  Write correct checksum when formatting partition
 2015-03-19 18:47:52 +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
644cb09275 am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp." 
* commit '0634fba5915073e5b46e24f0ba0d5bbc44c922a5':
  Remove unused printapk.cpp.
 2015-03-19 18:27:04 +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
Yin-Chia Yeh
3816e4a73a Merge "Camera: update createStream API to add new rotation field" 2015-03-19 17:27:39 +00:00
Eric Laurent
f09d4bd388 Merge "fix return from finally" 2015-03-19 17:20:26 +00: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
Mike Lockwood
ac9e2d756e Merge "MidiDeviceInfo: Add constants for future Bluetooth MIDI support" 2015-03-19 17:10:17 +00:00
Mathieu Chartier
543a3578ad am 05844d57: am b7d997a7: Merge "Revert "Change jit properties to be debug properties"" 
* commit '05844d573f33c77cd7bb608a118a998506a6996d':
  Revert "Change jit properties to be debug properties"
 2015-03-19 17:06:43 +00:00
Chris Craik
8144923714 Merge "Fix clang build" 2015-03-19 17:01:44 +00:00
Chris Craik
c6128bae43 Fix clang build 
Change-Id: I5336ac347123671a18401121c5f001c8f7caf54d
 2015-03-19 10:00:56 -07: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
160a253d48 am d71f548f: am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute." 
* commit 'd71f548f4803f0696af7de9a2989673cfd83800f':
  Add app-level usesCleartextTraffic manifest attribute.
 2015-03-19 16:43:52 +00:00
Yorke Lee
e9d827aa51 Merge "Make PhoneAccount.CAPABILITY_VIDEO_CALLING public" 2015-03-19 16:30:36 +00:00
Yorke Lee
04ed503e7b Make PhoneAccount.CAPABILITY_VIDEO_CALLING public 
Bug: 19824779
Change-Id: If38606d62bffbb7b794f530f3fcc09b6e5123b55
 2015-03-19 09:23:43 -07: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
Mike Lockwood
3f5acc6d48 MidiDeviceInfo: Add constants for future Bluetooth MIDI support 
Change-Id: Id89b691e923b9de8e5dce58527ba38e28e8e1d36
 2015-03-19 08:02:50 -07:00
Vinod Krishnan
ed7cfb67e7 am 7a2df74b: am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev 
* commit '7a2df74b1124746fa5400d3ed5e6e3680c8f3601':
  Make Theme.Micro point to Theme.Material
 2015-03-19 09:48:03 +00: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
Diego Perez
1599a4a0dc Merge "Make sure shaders use a color model compatible with the destination." 2015-03-19 09:22:27 +00:00
Benjamin Franz
bff46bac80 Add DO policy to disable safe boot mode. 
Bug: 19615843
Change-Id: I14dbe911995ec216c57bd285d6b7b04c9684591a
 2015-03-19 09:19:18 +00:00
Joe Fernandez
5955c31425 am e7114123: am bf6b1e00: am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs 
* commit 'e711412302a9e84bf14d772795a8ec58537926b9':
  docs: updated Auto training landing page
 2015-03-19 06:04:27 +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