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

176377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Albert
e24d36b7b7 am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch." 
* commit '1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea':
  Ensure alignment of Res_png_9patch.
 2015-04-09 18:31:38 +00:00
Rich Slogar
acae606f5d am a6b6952b: am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit 'a6b6952bb6aedf747e58055c120e98383e4491a3':
  docs: remove studio proguard settings from play services
 2015-04-09 18:31:31 +00:00
Dan Albert
1f799a6b96 am d9f32b16: Merge "Ensure alignment of Res_png_9patch." 
* commit 'd9f32b164be11b6c42ee36ca6945623073e82c99':
  Ensure alignment of Res_png_9patch.
 2015-04-09 18:26:34 +00:00
Rich Slogar
a6b6952bb6 am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '0b1610ff49b042df19fc9071f2811efb642f7df9':
  docs: remove studio proguard settings from play services
 2015-04-09 18:21:06 +00:00
Rich Slogar
0b1610ff49 am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '2489a7fd5fbafde339ac58f2f1e7a5854e7e4936':
  docs: remove studio proguard settings from play services
 2015-04-09 18:11:24 +00:00
Dan Albert
d9f32b164b Merge "Ensure alignment of Res_png_9patch." 2015-04-09 18:09:11 +00:00
Rich Slogar
2489a7fd5f am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '9d6e95879aff4608db400c270fa8f89b6b55d0e6':
  docs: remove studio proguard settings from play services
 2015-04-09 17:57:20 +00:00
Rich Slogar
9d6e95879a am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '36e3f5125895875c63242294da289ca4b09c9f9e':
  docs: remove studio proguard settings from play services
 2015-04-09 17:47:40 +00:00
Dan Albert
a18cee52d9 Ensure alignment of Res_png_9patch. 
This doesn't alter the alignment of the data within the struct, but
enforces that this structure will be appropriately aligned when used.

The image_info struct has this struct preceded by a bool, which causes
odd alignment for the members of this struct.

Change-Id: Ia2ef5c81b2f961c0f61858a10a7821d82f600919
 2015-04-09 10:41:38 -07:00
Rich Slogar
36e3f51258 Merge "docs: remove studio proguard settings from play services" into lmp-docs 2015-04-09 17:39:29 +00:00
Alex Klyubin
bbf3cc5797 am fd168151: am e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired." 
* commit 'fd1681513357309868c2659f215c931e4d27c40e':
  Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
 2015-04-09 17:21:52 +00:00
Alex Klyubin
fd16815133 am e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired." 
* commit 'e26347bb740f5d1bcf51036e63c1b1c91e685f4c':
  Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
 2015-04-09 17:10:57 +00:00
Alex Klyubin
e26347bb74 Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired." 2015-04-09 16:51:02 +00:00
Alex Klyubin
223977b914 Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired. 
This wasn't meant to be public API yet.

Bug: 18088752
Change-Id: I40e57fd9121348086ae88ad9fa54f930547b77ba
 2015-04-09 09:50:34 -07:00
Alex Klyubin
b9a9d46c77 am f7e7f744: am a482b046: Merge "Require IND-CPA by default for new AndroidKeyStore keys." 
* commit 'f7e7f744e193e027afde5c071889bde1c5882cfd':
  Require IND-CPA by default for new AndroidKeyStore keys.
 2015-04-09 16:43:32 +00:00
Alex Klyubin
f7e7f744e1 am a482b046: Merge "Require IND-CPA by default for new AndroidKeyStore keys." 
* commit 'a482b0469cb98a5743603e1602aa6f37c65d1659':
  Require IND-CPA by default for new AndroidKeyStore keys.
 2015-04-09 16:30:50 +00:00
Alex Klyubin
a482b0469c Merge "Require IND-CPA by default for new AndroidKeyStore keys." 2015-04-09 16:12:09 +00:00
Richard Uhler
00ff42a0ca am 7f757130: am f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat." 
* commit '7f7571308d5dc973e9b1e352d56643a74e99e588':
  Reuse dexopt method for both dex2oat and patchoat.
 2015-04-09 14:40:47 +00:00
Richard Uhler
7f7571308d am f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat." 
* commit 'f324d245fdd07ac14ab312d1a5fa04a4e8dfcceb':
  Reuse dexopt method for both dex2oat and patchoat.
 2015-04-09 14:31:10 +00:00
Richard Uhler
f324d245fd Merge "Reuse dexopt method for both dex2oat and patchoat." 2015-04-09 14:13:29 +00:00
Colin Cross
106f83ee9c am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge" 
* commit '4cead39a178dd8c4d7c1397e6ad5b861b08125b7':
  Re-enable -Wall and -Werror that were lost in a merge
 2015-04-09 01:23:28 +00:00
Colin Cross
4cead39a17 am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge" 
* commit '1be312dfb02e86731da6ac54a39956db791f4978':
  Re-enable -Wall and -Werror that were lost in a merge
 2015-04-09 01:13:50 +00:00
Olawale Ogunwale
33a68a521f am 343e291b: am e8a3c320: Merge "Prevent windows from freezing screen while timeout" 
* commit '343e291b67432427709a20e97f42fbc329c45c44':
  Prevent windows from freezing screen while timeout
 2015-04-09 00:56:27 +00:00
Alex Klyubin
2d81cb6824 am 2cb1e1dc: am 1da3d7fc: Merge "Add more digests to AndroidKeyStore API." 
* commit '2cb1e1dca0ae9d1b34774b16f07974ea56c42cb4':
  Add more digests to AndroidKeyStore API.
 2015-04-09 00:56:23 +00:00
Colin Cross
1be312dfb0 Merge "Re-enable -Wall and -Werror that were lost in a merge" 2015-04-09 00:49:56 +00:00
Colin Cross
01f185633c Re-enable -Wall and -Werror that were lost in a merge 
-Wall and -Werror were lost during a merge when they were added to
aaptCFLAGS instead of aaptCFlags.  Fix the typo, and the warnings
that crept in while it was disabled.

Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
 2015-04-08 17:48:23 -07:00
Olawale Ogunwale
343e291b67 am e8a3c320: Merge "Prevent windows from freezing screen while timeout" 
* commit 'e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e':
  Prevent windows from freezing screen while timeout
 2015-04-09 00:32:45 +00:00
Alex Klyubin
2cb1e1dca0 am 1da3d7fc: Merge "Add more digests to AndroidKeyStore API." 
* commit '1da3d7fcf33fd61f0143f8a410f0a77783fe1bfe':
  Add more digests to AndroidKeyStore API.
 2015-04-09 00:32:38 +00:00
Alex Klyubin
f853f64998 Require IND-CPA by default for new AndroidKeyStore keys. 
Bug: 18088752
Change-Id: I01e44b7155df4326b5c9d83dda57f889c1f23ec7
 2015-04-08 16:28:27 -07:00
Alex Klyubin
da66cab36e am f1a1160c: am c0d6b7cb: Merge "Fix typo" 
* commit 'f1a1160c68f6c289d3b82573f1a16f9c52aebab4':
  Fix typo
 2015-04-08 22:03:55 +00:00
Alex Klyubin
9be1016b44 am c48e8cf0: am edd0e6c0: Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore." 
* commit 'c48e8cf07a180e185948673579828d064e6efc7a':
  Refuse to reuse IV in encryption mode in AndroidKeyStore.
 2015-04-08 22:03:51 +00:00
Alex Klyubin
8ad875f52d am 0649c832: am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API." 
* commit '0649c832b8285d1b07c6e07362dbfe3ca0535609':
  Add BlockMode.GCM constant to AndroidKeyStore API.
 2015-04-08 22:03:47 +00:00
Olawale Ogunwale
e8a3c320e6 Merge "Prevent windows from freezing screen while timeout" 2015-04-08 21:56:16 +00:00
Alex Klyubin
f1a1160c68 am c0d6b7cb: Merge "Fix typo" 
* commit 'c0d6b7cb752b50ed37197e15cc6f305a0038e61b':
  Fix typo
 2015-04-08 21:37:26 +00:00
Alex Klyubin
c48e8cf07a am edd0e6c0: Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore." 
* commit 'edd0e6c09820b08f22937bbbc00149adc6d66f07':
  Refuse to reuse IV in encryption mode in AndroidKeyStore.
 2015-04-08 21:37:11 +00:00
Alex Klyubin
0649c832b8 am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API." 
* commit '3283d2d208c0686fa964008e1520179948886adb':
  Add BlockMode.GCM constant to AndroidKeyStore API.
 2015-04-08 21:37:04 +00:00
Alex Klyubin
1da3d7fcf3 Merge "Add more digests to AndroidKeyStore API." 2015-04-08 21:32:09 +00:00
Alex Klyubin
70376a7728 Add more digests to AndroidKeyStore API. 
This adds MD5, SHA-1, SHA-224, SHA-384, and SHA-512. SHA-256 was
already there.

MD5 is not exposed for HMAC on purpose, because MD5 has been
deprecated for years.

Bug: 18088752
Change-Id: I4df3d3f6cf10805c7910a1bdb577a91c85055945
 2015-04-08 14:17:21 -07:00
Quddus Chong
163e501609 am ff5e9554: am 67f0c8db: am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'ff5e9554cf0a1a2eaf2e353698b91400a3c57f17':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 19:10:47 +00:00
Quddus Chong
ff5e9554cf am 67f0c8db: am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit '67f0c8db35be1c43b3f588e3414557749a277e6f':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:59:37 +00:00
Quddus Chong
67f0c8db35 am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'a147451ab92e29141cd85d5c75a881586d5959df':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:48:57 +00:00
Quddus Chong
a147451ab9 am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'c61fd05581a80bcecf50509acb220ea3e2817e56':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:38:47 +00:00
Quddus Chong
5985981ba4 am b49748cf: am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit 'b49748cfd3a4f87c394307787665c09521faa77d':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 18:33:43 +00:00
Quddus Chong
c61fd05581 am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'ff4c632592cce177997d63b3ff81c0b2be9cf9bb':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:27:56 +00:00
Quddus Chong
b49748cfd3 am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit '0c5752be40a9e7ced5be2659965f3c4ba3c3f4eb':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 18:23:52 +00:00
Quddus Chong
ff4c632592 Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 2015-04-08 18:16:58 +00:00
Alex Klyubin
c0d6b7cb75 Merge "Fix typo" 2015-04-08 18:16:38 +00:00
Quddus Chong
0c5752be40 am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit 'c736e8cf41445e7a32721da617d6d7eacd189703':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 18:11:55 +00:00
Alex Klyubin
6895a549ec Fix typo 
Change-Id: I1c47ade98ad3ae41dc55e7bcafcad6901b559c89
 2015-04-08 11:08:37 -07:00
Alex Klyubin
edd0e6c098 Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore." 2015-04-08 18:04:39 +00:00