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

199245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Albert
492253742a am 3a059d2d: am f35f66a8: Merge "Use new sanitizer option." 
* commit '3a059d2d89dd87690ccf4081097d8d069bb7f3c4':
  Use new sanitizer option.
 2015-06-16 21:45:32 +00:00
Ruben Brunk
88727a3c87 am 8d58dcc7: am 1c52669d: Merge "Add distortion correction opcodes in DngCreator." into mnc-dev 
* commit '8d58dcc7f10bbfb88b3575cbb6a03f0f0af02abd':
  Add distortion correction opcodes in DngCreator.
 2015-06-16 21:26:14 +00:00
Alex Klyubin
c2416017d6 am 8e04473d: am e8265154: Merge "Harden KeyInfo." into mnc-dev 
* commit '8e04473de1646c6c54dbda690411f54ddd8924e0':
  Harden KeyInfo.
 2015-06-16 21:25:58 +00:00
Eino-Ville Talvala
70b68cdac4 am e652f928: am 57af7531: Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev 
* commit 'e652f928ad22b00b36271caace29a0fdd17dd9a2':
  Camera: Adjust intrinsic transform coordinate system.
 2015-06-16 21:25:53 +00:00
Alex Klyubin
1f30907edb am faffb34e: am ee0a0c6f: Merge "Harden and clean up KeyProtection." into mnc-dev 
* commit 'faffb34ec735a45dd216aafdc604968e386deeee':
  Harden and clean up KeyProtection.
 2015-06-16 21:25:38 +00:00
Alex Klyubin
686e1b97aa am 301e99a0: am 4f131667: Merge "Harden and clean up KeyGenParameterSpec." into mnc-dev 
* commit '301e99a049e4654616d01f6fc10b25fa3e3660fd':
  Harden and clean up KeyGenParameterSpec.
 2015-06-16 21:25:33 +00:00
Rubin Xu
befbdb00f9 am a4f1642b: am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 
* commit 'a4f1642ba16c13779d6a8ef187096259bcd1fd6f':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
 2015-06-16 21:25:28 +00:00
Chris Wren
bf539186cb am db31e283: am 3397727b: Merge "disable verbose logs from people notifications." into mnc-dev 
* commit 'db31e283af0d77ec59a83841b1c3fe4f8e40aebe':
  disable verbose logs from people notifications.
 2015-06-16 21:25:18 +00:00
Felipe Leme
46301a62ea am 8234ed70: am fcb55902: Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev 
* commit '8234ed70cb8b009845a9b0e974e7fdfb1eefafeb':
  Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.
 2015-06-16 21:25:13 +00:00
John Reck
f9fd28e794 am de3799ca: am f24bed80: Merge "Fix null deref" into mnc-dev 
* commit 'de3799ca167dc424e2128dd3a041efaa806dde7c':
  Fix null deref
 2015-06-16 21:25:03 +00:00
Fyodor Kupolov
e8d8404614 am 4c1e8ecf: am 27a88a3e: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev 
* commit '4c1e8ecf0003f18105819a34e7c182dd9eb64d93':
  Additional OP_READ_PHONE_STATE AppOps checks for telephony
 2015-06-16 21:24:58 +00:00
Felipe Leme
1d882bafc7 am 0fe3f871: am a106554c: Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev 
* commit '0fe3f8715fd9d4b9d546073d048b33744b695233':
  Changed BugReportReceiver to send zipped bugreports.
 2015-06-16 21:24:53 +00:00
Chirag Shah
3db44d08ea am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit 'f40f46e94c773676158b3f7e9cd51157cc9a91d2':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 21:24:48 +00:00
Jason Monk
225a049d7a am cb44d7d7: am ece811da: Merge "Add ic_dialog_alert_material to symbols" into mnc-dev 
* commit 'cb44d7d72c7a14018eb498e343604bd3573f676e':
  Add ic_dialog_alert_material to symbols
 2015-06-16 21:24:44 +00:00
Dianne Hackborn
726d6993ae am 1141dea8: am 9cc842f0: Merge "Fix issue #21816660 (app standby), work on issue #20882522 (voice interact)" into mnc-dev 
* commit '1141dea8e074d1a0dd67673e26f54f950d60ba3e':
  Fix issue #21816660 (app standby), work on issue #20882522 (voice interact)
 2015-06-16 21:24:39 +00:00
Abodunrinwa Toki
a9eee50455 am 03c70cac: am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev 
* commit '03c70cac9a0d9dc7c9f2c71b28aaf609393fdcf3':
  Fix floating toolbar flickers.
 2015-06-16 21:24:34 +00:00
George Mount
b5f0e3bdba am 2a255904: am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 
* commit '2a25590428d3fa8e01f74f214b7c4c2d1c712afe':
  Have the final setVisibility cause a requestLayout.
 2015-06-16 21:24:30 +00:00
Mark Salyzyn
5c5fc99091 am 2cfdf938: am 2b3db144: jni: isLoggable calls __android_log_is_loggable 
* commit '2cfdf938b0d934a1aab54a0bd83fa722cc5cc31a':
  jni: isLoggable calls __android_log_is_loggable
 2015-06-16 21:24:25 +00:00
Benjamin Franz
3be79152cf am 84e38f68: am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 
* commit '84e38f687819e47ffe3bae1fd2588d0f22fafa90':
  Update documentation for PASSWORD_QUALITY_SOMETHING
 2015-06-16 21:24:20 +00:00
Clara Bayarri
17fc9ddc98 am e979193e: am ec01f3d2: Merge "Add suggested width for Floating Toolbar on large devices" into mnc-dev 
* commit 'e979193e48888e7651a641e42d3442262cbbb0dd':
  Add suggested width for Floating Toolbar on large devices
 2015-06-16 21:24:15 +00:00
Abodunrinwa Toki
686a2e633c am 7ebde83a: am 6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev 
* commit '7ebde83a479f6447e0862e814830374a8477665b':
  Floating toolbar no longer obstructs the soft keyboard.
 2015-06-16 21:24:10 +00:00
Narayan Kamath
ba6e9b12a2 am 2d13fe56: am 275294db: Merge "Better systrace slices for application startup." into mnc-dev 
* commit '2d13fe56eec54030fe09cae74c7a92be54c8bd19':
  Better systrace slices for application startup.
 2015-06-16 21:24:04 +00:00
Paul Jensen
79cd02c4b0 am 8235c839: am 19769114: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 
* commit '8235c839aa9caaf6b36820007f928367bd829736':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
 2015-06-16 21:24:00 +00:00
Dan Albert
3a059d2d89 am f35f66a8: Merge "Use new sanitizer option." 
* commit 'f35f66a86bfe7afd55ee3c8c9f624a55a1d6c2fe':
  Use new sanitizer option.
 2015-06-16 21:22:51 +00:00
Dan Albert
f35f66a86b Merge "Use new sanitizer option." 2015-06-16 21:11:09 +00:00
Ruben Brunk
8d58dcc7f1 am 1c52669d: Merge "Add distortion correction opcodes in DngCreator." into mnc-dev 
* commit '1c52669d1f35e11feaad52a65507a9c4f1f4c876':
  Add distortion correction opcodes in DngCreator.
 2015-06-16 21:08:02 +00:00
Dan Albert
f98dae5675 Use new sanitizer option. 
Change-Id: Iabc46da2820f252f6cd8cef8a447064890f3a76d
 2015-06-16 14:06:49 -07:00
Ruben Brunk
1c52669d1f Merge "Add distortion correction opcodes in DngCreator." into mnc-dev 2015-06-16 20:50:30 +00:00
Alex Klyubin
8e04473de1 am e8265154: Merge "Harden KeyInfo." into mnc-dev 
* commit 'e826515469274b4675a5ae6948dd04855ff0b786':
  Harden KeyInfo.
 2015-06-16 20:45:31 +00:00
Eino-Ville Talvala
e652f928ad am 57af7531: Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev 
* commit '57af75313c005134b85cf29b7e9972ca1fad53dc':
  Camera: Adjust intrinsic transform coordinate system.
 2015-06-16 20:45:26 +00:00
Alex Klyubin
e826515469 Merge "Harden KeyInfo." into mnc-dev 2015-06-16 20:37:59 +00:00
Eino-Ville Talvala
57af75313c Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev 2015-06-16 20:37:35 +00:00
Alex Klyubin
ffdfb57931 Harden KeyInfo. 
This ensures that KeyInfo instances are truly immutable.

Bug: 18088752
Change-Id: Ic157d3b928b129a02c3cab9dd20ba9936a005813
 2015-06-16 13:13:13 -07:00
Alex Klyubin
faffb34ec7 am ee0a0c6f: Merge "Harden and clean up KeyProtection." into mnc-dev 
* commit 'ee0a0c6ff49a0d9b8f63a71c6c4c50f9f31736a1':
  Harden and clean up KeyProtection.
 2015-06-16 20:08:34 +00:00
Alex Klyubin
301e99a049 am 4f131667: Merge "Harden and clean up KeyGenParameterSpec." into mnc-dev 
* commit '4f1316670728ffd440bec50c69b4ea47515eebc6':
  Harden and clean up KeyGenParameterSpec.
 2015-06-16 20:08:27 +00:00
Rubin Xu
a4f1642ba1 am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 
* commit 'dd862aebda15a5b63c90b1b670373028b48172c4':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
 2015-06-16 20:07:45 +00:00
Chris Wren
db31e283af am 3397727b: Merge "disable verbose logs from people notifications." into mnc-dev 
* commit '3397727b165a432ab5d82789798375f4688c6b1e':
  disable verbose logs from people notifications.
 2015-06-16 20:07:39 +00:00
Felipe Leme
8234ed70cb am fcb55902: Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev 
* commit 'fcb559021da91b13ff3b0efd86b9aba957f9712c':
  Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.
 2015-06-16 20:07:31 +00:00
John Reck
de3799ca16 am f24bed80: Merge "Fix null deref" into mnc-dev 
* commit 'f24bed80e027a2b14652ac9d46900c11312efa6b':
  Fix null deref
 2015-06-16 20:07:26 +00:00
Fyodor Kupolov
4c1e8ecf00 am 27a88a3e: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev 
* commit '27a88a3eb6a6a456ea3ec1b81a8fb26333f904a5':
  Additional OP_READ_PHONE_STATE AppOps checks for telephony
 2015-06-16 20:07:22 +00:00
Felipe Leme
0fe3f8715f am a106554c: Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev 
* commit 'a106554c20c72e284d64ea074933554e5dc29da9':
  Changed BugReportReceiver to send zipped bugreports.
 2015-06-16 20:07:15 +00:00
Chirag Shah
f40f46e94c am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit '7f92f06742fe3b66b9e8049db62ea55e1b41adf5':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 20:07:11 +00:00
Jason Monk
cb44d7d72c am ece811da: Merge "Add ic_dialog_alert_material to symbols" into mnc-dev 
* commit 'ece811dac9a2784b4a2937a4ece75b58d0db9e8b':
  Add ic_dialog_alert_material to symbols
 2015-06-16 20:07:05 +00:00
Dianne Hackborn
1141dea8e0 am 9cc842f0: Merge "Fix issue #21816660 (app standby), work on issue #20882522 (voice interact)" into mnc-dev 
* commit '9cc842f0ee491aa7b4fcea02823c3aa273465ac1':
  Fix issue #21816660 (app standby), work on issue #20882522 (voice interact)
 2015-06-16 20:07:01 +00:00
Abodunrinwa Toki
03c70cac9a am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev 
* commit '98f98dd19def468afc310bd879cb79cce9917ba2':
  Fix floating toolbar flickers.
 2015-06-16 20:06:55 +00:00
George Mount
2a25590428 am 209fb433: Merge "Have the final setVisibility cause a requestLayout." into mnc-dev 
* commit '209fb43376989c9a68f947d12bae3ea87e4101d2':
  Have the final setVisibility cause a requestLayout.
 2015-06-16 20:06:49 +00:00
Mark Salyzyn
2cfdf938b0 am 2b3db144: jni: isLoggable calls __android_log_is_loggable 
* commit '2b3db1444ab0bb7c2a2d13febb4fa88aebecf74c':
  jni: isLoggable calls __android_log_is_loggable
 2015-06-16 20:06:38 +00:00
Benjamin Franz
84e38f6878 am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 
* commit 'dbc86ad170e2c288f0154a264d12bd6dadf78c45':
  Update documentation for PASSWORD_QUALITY_SOMETHING
 2015-06-16 20:06:33 +00:00
Clara Bayarri
e979193e48 am ec01f3d2: Merge "Add suggested width for Floating Toolbar on large devices" into mnc-dev 
* commit 'ec01f3d276e2e06647f5a71e45b06e7cf964cc19':
  Add suggested width for Floating Toolbar on large devices
 2015-06-16 20:06:28 +00:00
Abodunrinwa Toki
7ebde83a47 am 6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev 
* commit '6161c5b4cd54036bc4f38455a0c7c11b8201e4a0':
  Floating toolbar no longer obstructs the soft keyboard.
 2015-06-16 20:06:23 +00:00