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

198712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
017efadc2e am 16422b25: Merge changes If241e329,Ib69b6987 into mnc-dev 
* commit '16422b25f7a814be0c3ceba44a4e9e62b10427a5':
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
 2015-06-04 21:18:40 +00:00
Nancy Chen
1319e2f82b am 65561b5c: Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev 
* commit '65561b5c5100d4d4b18d5086cba52d796122e78d':
  Add carrier package name field to check for carrier vvm app.
 2015-06-04 21:18:35 +00:00
Vadim Tryshev
f46a5828ac am c51c3f64: Merge "Processing non-long clicks on application icon." into mnc-dev 
* commit 'c51c3f6436bc4e101c63c388fd6ba8b46f2d4189':
  Processing non-long clicks on application icon.
 2015-06-04 21:18:30 +00:00
Alex Klyubin
28d99c2419 am df6c6702: Merge "Streamline Android Keystore delete entry operation." into mnc-dev 
* commit 'df6c67028a0341a5b05d5097e12ae4d0cbb69fa4':
  Streamline Android Keystore delete entry operation.
 2015-06-04 21:18:26 +00:00
Alex Klyubin
aa880c9122 am b070e486: Merge "Reliably delete keys if key generation fails." into mnc-dev 
* commit 'b070e486c8afb2b83483759ec9966c585f7a8b59':
  Reliably delete keys if key generation fails.
 2015-06-04 21:18:21 +00:00
Makoto Onuki
9f9d70b603 Change option label from "Duplex" to "Two-sided" 
Bug 21640154

Change-Id: Icab4754e0aeb23fc4da178e7306f5c7a74108c22
 2015-06-04 14:17:44 -07:00
Jeff Brown
16422b25f7 Merge changes If241e329,Ib69b6987 into mnc-dev 
* changes:
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
 2015-06-04 21:11:05 +00:00
Nancy Chen
65561b5c51 Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev 2015-06-04 21:09:45 +00:00
Eino-Ville Talvala
51db02446c am def679d0: am 05ae9b56: Merge "Camera: Change origin of poseTranslation." into mnc-dev 
* commit 'def679d05ad7412d634b79cb46b314b6cd118919':
  Camera: Change origin of poseTranslation.
 2015-06-04 21:09:24 +00:00
Chris Craik
a8ade97bac am f72e1e27: am 0ee780a9: Merge "Ensure RenderScript tracing is always balanced via try/finally" into mnc-dev 
* commit 'f72e1e271e3d0e7b52ce256c9b5ba2736e5a9efa':
  Ensure RenderScript tracing is always balanced via try/finally
 2015-06-04 21:09:19 +00:00
Ruben Brunk
9ff782f255 am 557fab42: am 74fc1837: Merge "Fix CameraManager#open exception handling." into mnc-dev 
* commit '557fab42fae1347bd9137a376747a8fbd7612103':
  Fix CameraManager#open exception handling.
 2015-06-04 21:09:13 +00:00
Vadim Tryshev
c51c3f6436 Merge "Processing non-long clicks on application icon." into mnc-dev 2015-06-04 21:08:33 +00:00
Alex Klyubin
df6c67028a Merge "Streamline Android Keystore delete entry operation." into mnc-dev 2015-06-04 21:06:29 +00:00
Alex Klyubin
b070e486c8 Merge "Reliably delete keys if key generation fails." into mnc-dev 2015-06-04 21:05:41 +00:00
Eino-Ville Talvala
def679d05a am 05ae9b56: Merge "Camera: Change origin of poseTranslation." into mnc-dev 
* commit '05ae9b56aec7c1a261eb84741b43e40351d20bd4':
  Camera: Change origin of poseTranslation.
 2015-06-04 21:00:04 +00:00
Chris Craik
f72e1e271e am 0ee780a9: Merge "Ensure RenderScript tracing is always balanced via try/finally" into mnc-dev 
* commit '0ee780a9934f1cc9da7dd82e73907336a86b5be8':
  Ensure RenderScript tracing is always balanced via try/finally
 2015-06-04 20:59:59 +00:00
Ruben Brunk
557fab42fa am 74fc1837: Merge "Fix CameraManager#open exception handling." into mnc-dev 
* commit '74fc1837e014e6bfbc2c5d47eefa6bed6698394b':
  Fix CameraManager#open exception handling.
 2015-06-04 20:59:17 +00:00
Eino-Ville Talvala
70162cc975 am e2ab7a29: am 0207367c: am ea7547f1: Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 
* commit 'e2ab7a29c4da2e6ec1da460179a59aa0f365e383':
  CameraManager: Ensure all public methods connect to camera service.
 2015-06-04 20:56:07 +00:00
Eino-Ville Talvala
05ae9b56ae Merge "Camera: Change origin of poseTranslation." into mnc-dev 2015-06-04 20:52:02 +00:00
Chris Craik
0ee780a993 Merge "Ensure RenderScript tracing is always balanced via try/finally" into mnc-dev 2015-06-04 20:47:34 +00:00
Ruben Brunk
74fc1837e0 Merge "Fix CameraManager#open exception handling." into mnc-dev 2015-06-04 20:43:16 +00:00
Alex Klyubin
ccbe88a505 Expose RSA and ECDSA Signature from Android Keystore Provider. 
The RSA Signature supports PKCS#1 and PSS padding.

Bug: 18088752
Bug: 20912868
Change-Id: I03cdc86d1935af36f7c87a0b23d67f813829cfb0
 2015-06-04 13:42:43 -07:00
Eino-Ville Talvala
d3dbfb3f75 Camera: Change origin of poseTranslation. 
No actual defined center for the Android sensor coordinate system
exists, so define the translation relative to the largest camera
device facing the same way.

Bug: 20123879
Change-Id: Ica33d23717c976c063c26b768af5b6148483909c
 2015-06-04 13:41:56 -07:00
Adam Powell
7404c99683 am be899a3c: am cce32a82: am 1da56b51: Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev 
* commit 'be899a3cde7576feb975ddf5f860f21fd60e5f3a':
  Make WindowInsets#hasInsets check for stable insets as well
 2015-06-04 20:39:32 +00:00
Chad Brubaker
f23d61ea9a am 28a0a83c: am 4780ef23: am 43e77bf6: Merge "Add optional additional entropy to finish" into mnc-dev 
* commit '28a0a83c3d893d50ee9ef36f7586376019d09f34':
  Add optional additional entropy to finish
 2015-06-04 20:39:28 +00:00
Adam Lesinski
7cd66b81e0 am aeac2a82: am c2341e3b: am 581cc1ee: Merge "AAPT2: Change xml file parsing to DOM based" into mnc-dev 
* commit 'aeac2a82d95789d0ae36a87708ce1e1d20e2a31e':
  AAPT2: Change xml file parsing to DOM based
 2015-06-04 20:39:21 +00:00
Eino-Ville Talvala
e2ab7a29c4 am 0207367c: am ea7547f1: Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 
* commit '0207367c5f41ed2bee9cee0eb131e695e80db81d':
  CameraManager: Ensure all public methods connect to camera service.
 2015-06-04 20:39:14 +00:00
Adam Powell
dd3cda73ff am 1cf4c2c3: am 8e44ec0e: am 2b710c29: Merge "Add DENSITY_360" into mnc-dev 
* commit '1cf4c2c3b62e4b3a193b809191348896f6f413fe':
  Add DENSITY_360
 2015-06-04 20:39:14 +00:00
Amit Mahajan
7fea563552 am 4e91711d: am 1ebe0b38: am b2556363: Fixed punctuation in comment. 
* commit '4e91711df38a6efd13e87ba3a289f4e3311131ca':
  Fixed punctuation in comment.
 2015-06-04 20:39:09 +00:00
Amit Mahajan
d4f4add515 am bddb70b7: am d9899c06: am b8a4ba86: Merge "Update getVoiceMessageCount() comments." into mnc-dev 
* commit 'bddb70b7db490336e6fcbeb53b8a9b1cb0c7b99a':
  Update getVoiceMessageCount() comments.
 2015-06-04 20:39:04 +00:00
Eric Laurent
3469299338 am b4ed9156: am 3c0faae0: am 01b9c4cd: Merge "Ringtone: keep a reference until playback completion." into mnc-dev 
* commit 'b4ed9156ca9473d3461f873b60ec57cf4001d53d':
  Ringtone: keep a reference until playback completion.
 2015-06-04 20:38:58 +00:00
Feixiong Zhang
f099fbf74c am c58d411c: am bd9e049a: am 170d4408: Merge "Fix the empty reason field in connectivity change intent." into mnc-dev 
* commit 'c58d411c379718231786cf7b3f3238aebd1ba8b5':
  Fix the empty reason field in connectivity change intent.
 2015-06-04 20:38:52 +00:00
Dmitriy Ivanov
4c8fd90563 am 75ebffbd: am a4ae987a: am f8e5993c: Merge "Fix abi detection for system apks" into mnc-dev 
* commit '75ebffbd85a0a56e1c111586688cf3ecd59c9ddc':
  Fix abi detection for system apks
 2015-06-04 20:38:47 +00:00
Vadim Tryshev
c1a6c658ae Processing non-long clicks on application icon. 
This CL alone doens't fix the whole bug, see the bug
for the AI list.

In normal mode, clicking at application icon on a task view
is ignored to avoid accidental clicks. To open app properties,
we need a long click.

In accessibility mode, we want to make it easier to open app
properties, and accidental clicks are less likely. Hence, allowing
"simple" clicks.

Bug: 20945599
Change-Id: Iec3f911dced1eda09175500fc1e798dd09b6f9e2
 2015-06-04 13:26:53 -07:00
Eino-Ville Talvala
0207367c5f am ea7547f1: Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 
* commit 'ea7547f155e230f30c489db3626dce1c69a9004e':
  CameraManager: Ensure all public methods connect to camera service.
 2015-06-04 20:26:14 +00:00
Adam Powell
be899a3cde am cce32a82: am 1da56b51: Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev 
* commit 'cce32a829054a9ba4d5dd8774ead9d1ef6c92017':
  Make WindowInsets#hasInsets check for stable insets as well
 2015-06-04 20:20:55 +00:00
Chad Brubaker
28a0a83c3d am 4780ef23: am 43e77bf6: Merge "Add optional additional entropy to finish" into mnc-dev 
* commit '4780ef23baea5278680350ccf40694abd2d1b5c0':
  Add optional additional entropy to finish
 2015-06-04 20:20:50 +00:00
Adam Lesinski
aeac2a82d9 am c2341e3b: am 581cc1ee: Merge "AAPT2: Change xml file parsing to DOM based" into mnc-dev 
* commit 'c2341e3b557e6de2627032488d91ed4188119003':
  AAPT2: Change xml file parsing to DOM based
 2015-06-04 20:20:44 +00:00
Adam Powell
1cf4c2c3b6 am 8e44ec0e: am 2b710c29: Merge "Add DENSITY_360" into mnc-dev 
* commit '8e44ec0ec2c387b12b539715a7747513f874d22d':
  Add DENSITY_360
 2015-06-04 20:20:38 +00:00
Amit Mahajan
4e91711df3 am 1ebe0b38: am b2556363: Fixed punctuation in comment. 
* commit '1ebe0b38b1d656265eede48e4050b2ee66371916':
  Fixed punctuation in comment.
 2015-06-04 20:20:30 +00:00
Amit Mahajan
bddb70b7db am d9899c06: am b8a4ba86: Merge "Update getVoiceMessageCount() comments." into mnc-dev 
* commit 'd9899c06d6f2f0ab3c72a2dd841996cd8c406c78':
  Update getVoiceMessageCount() comments.
 2015-06-04 20:20:23 +00:00
Eric Laurent
b4ed9156ca am 3c0faae0: am 01b9c4cd: Merge "Ringtone: keep a reference until playback completion." into mnc-dev 
* commit '3c0faae06edd13f0900a799570dd7f515c317ad0':
  Ringtone: keep a reference until playback completion.
 2015-06-04 20:20:17 +00:00
Feixiong Zhang
c58d411c37 am bd9e049a: am 170d4408: Merge "Fix the empty reason field in connectivity change intent." into mnc-dev 
* commit 'bd9e049ad6dc8e53ae601ccd1a11353a59ca163d':
  Fix the empty reason field in connectivity change intent.
 2015-06-04 20:20:11 +00:00
Dmitriy Ivanov
75ebffbd85 am a4ae987a: am f8e5993c: Merge "Fix abi detection for system apks" into mnc-dev 
* commit 'a4ae987a6407d4d31768af60d57ed3d29701523d':
  Fix abi detection for system apks
 2015-06-04 20:20:01 +00:00
Alex Klyubin
97a27a73e6 Export KeyFactory backed by Android Keystore. 
The KeyFactory can be used to obtain information (KeyInfo) about
Android Keystore private keys.

Bug: 18088752
Change-Id: Ied1a69928f391537de6765cef7dc7d7241cf62bb
 2015-06-04 13:19:50 -07:00
Eino-Ville Talvala
ea7547f155 Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 2015-06-04 20:13:41 +00:00
Adam Powell
cce32a8290 am 1da56b51: Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev 
* commit '1da56b51d59aa4c587dcdb5bf4c1719961be0ae7':
  Make WindowInsets#hasInsets check for stable insets as well
 2015-06-04 20:07:04 +00:00
Chad Brubaker
4780ef23ba am 43e77bf6: Merge "Add optional additional entropy to finish" into mnc-dev 
* commit '43e77bf6209bd964bd9cc568b5f37b26401956b3':
  Add optional additional entropy to finish
 2015-06-04 20:06:59 +00:00
Adam Lesinski
c2341e3b55 am 581cc1ee: Merge "AAPT2: Change xml file parsing to DOM based" into mnc-dev 
* commit '581cc1ee59d01fe4b4a31618ab4aedfa639e42b0':
  AAPT2: Change xml file parsing to DOM based
 2015-06-04 20:06:53 +00:00
Adam Powell
8e44ec0ec2 am 2b710c29: Merge "Add DENSITY_360" into mnc-dev 
* commit '2b710c29e2ae7808bbd1a1a6d0c39f69ad8bf33a':
  Add DENSITY_360
 2015-06-04 20:06:49 +00:00