Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,021 Commits 3 Branches 0 Tags
4e3fb992b7e5b84dfd54552cba1890eeb0296e46
Commit Graph

197021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daichi Hirono
4e3fb992b7 am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev 
* commit '100e1c9235720ac020a20009da8b85f64efd4c11':
  Fix API doc of MtpDevice#getObjectHandles.
 2015-06-16 01:38:31 +00:00
Daichi Hirono
100e1c9235 Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev 2015-06-16 01:30:31 +00:00
Adrian Roos
5f6e00d809 am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev 
* commit '2bfe96513884f0c4a4836a615a80e17a1ba30173':
  Fix unnecessairy announcements when collapsing shade
 2015-06-16 01:27:35 +00:00
Ruben Brunk
e9a1f181ee am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit '9a2da54e3c7b5f382d2654eeb5228b945edd8e39':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:22:41 +00:00
Christopher Tate
73f2f66ae0 am 60177af8: Merge "Clean up app-link verification policy" into mnc-dev 
* commit '60177af86aca7712e2e442ca8e39376dad33a545':
  Clean up app-link verification policy
 2015-06-16 01:22:36 +00:00
Adrian Roos
2bfe965138 Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev 2015-06-16 01:18:01 +00:00
Adrian Roos
54d031bf03 Fix unnecessairy announcements when collapsing shade 
Bug: 20171694
Change-Id: Iec73098e2f778dac4a920a717385139952017330
 2015-06-15 18:17:16 -07:00
Ruben Brunk
9a2da54e3c Merge "Add metadata for pre-distortion dimensions." into mnc-dev 2015-06-16 01:12:58 +00:00
Christopher Tate
60177af86a Merge "Clean up app-link verification policy" into mnc-dev 2015-06-16 01:10:48 +00:00
Ruben Brunk
224eb3a4f1 Add metadata for pre-distortion dimensions. 
Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
 2015-06-15 18:09:33 -07:00
Makoto Onuki
2ae1caf984 am e43bf4bb: Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev 
* commit 'e43bf4bb4511ec756512a44164ff79cce3a02348':
  Allow killApplicationWithAppId() on secondary users
 2015-06-16 01:00:49 +00:00
Makoto Onuki
e43bf4bb45 Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev 2015-06-16 00:51:36 +00:00
Adam Lesinski
f86b2096e5 am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 
* commit 'd5e5151f6ceab498e3a35928c1f6f7a177c1544e':
  Bluetooth energy: fix overflow in calculation
 2015-06-16 00:48:29 +00:00
Adrian Roos
7383bf334d am d719215f: Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev 
* commit 'd719215fed261b41ae29acf87faef00f76c8faa7':
  Fix accessibility ghosts in quick settings detail
 2015-06-16 00:48:24 +00:00
Adam Lesinski
d5e5151f6c Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev 2015-06-16 00:46:09 +00:00
Adrian Roos
d719215fed Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev 2015-06-16 00:35:12 +00:00
Makoto Onuki
fa24bd8ab6 Allow killApplicationWithAppId() on secondary users 
Bug 20949609

Change-Id: If0e766aeb3e8b4aa6aebed3b75bcedd75251e382
 2015-06-15 17:32:00 -07:00
Adrian Roos
d366cb130d Fix accessibility ghosts in quick settings detail 
Fixes a bug where the tile that was just clicked on
to go to the detail view would become visible and cause
confusion to accessibility services.

Bug: 20209718
Change-Id: I1678a4fc35e8d739b7c657e868b02a25eddcba1d
 2015-06-15 17:28:37 -07:00
Adam Lesinski
8a35137388 Bluetooth energy: fix overflow in calculation 
Use longs instead of ints, because the energy values can get pretty
high.

Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671
 2015-06-15 17:19:07 -07:00
Junda Liu
b7f9e8a44d am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 
* commit '73d043232434f3ad37af26615919eac3117536b7':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
 2015-06-16 00:00:50 +00:00
Adrian Roos
ffb09270aa am 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev 
* commit '6ecdcf2aa01b2510bf6d506b92172dbc32beeec9':
  Add AssistUtils
 2015-06-16 00:00:45 +00:00
Junda Liu
73d0432324 Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 2015-06-15 23:54:38 +00:00
Adrian Roos
6ecdcf2aa0 Merge "Add AssistUtils" into mnc-dev 2015-06-15 23:49:22 +00:00
Quddus Chong
79ae28ec5f am 0e5dc780: am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 
* commit '0e5dc780f00b6c91d0bcfd46512759c6e8a2a81b':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571
 2015-06-15 23:16:43 +00:00
Adrian Roos
86e34ca902 am 9f33d6cb: Fix stuck orientation in SetupWizard 
* commit '9f33d6cb2ed90e2fff3d99cfcf90f6074b1b9f04':
  Fix stuck orientation in SetupWizard
 2015-06-15 23:16:39 +00:00
Junda Liu
e478649373 Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager. 
Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
 2015-06-15 16:12:02 -07:00
Quddus Chong
0e5dc780f0 am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 
* commit '418ff64748cb866d3dec8a448efffb0cbceec52d':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571
 2015-06-15 23:11:02 +00:00
Adrian Roos
e91750804a Add AssistUtils 
Enables code sharing with Settings for consistent
default value handling.

Bug: 21780590
Change-Id: I669b673f90fab503ae0c2179f09ebac9592bd33a
 2015-06-15 16:07:48 -07:00
Zhijun He
5e83c9080c am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev 
* commit 'fa4b7fb856a0f978529626fabcddf45fd57ecc3e':
  Camera2: fix Surface cast issue
 2015-06-15 23:06:18 +00:00
John Spurlock
1e17afa76a am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '9f206bec2d58e5edcebb134013e2d9a23659a4d4':
  Fix typo in TtsSpan.
 2015-06-15 23:06:13 +00:00
Adrian Roos
9f33d6cb2e Fix stuck orientation in SetupWizard 
Bug: 21755092
Change-Id: I3144a81523ce2ef4bf6dc457c0ea4b9723dae489
 2015-06-15 23:02:41 +00:00
Quddus Chong
418ff64748 am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 
* commit '79b30681bbe26b95a8705e17957c1063517ec8f3':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571
 2015-06-15 22:59:13 +00:00
Zhijun He
fa4b7fb856 Merge "Camera2: fix Surface cast issue" into mnc-dev 2015-06-15 22:58:50 +00:00
Christopher Tate
72c10a25f0 Clean up app-link verification policy 
If an app claims to be the official auto-verified app for any domain
and thus the automatic handler for ACTION_VIEW / {http,https}://...
intents naming that domain, then we require that it verify as the
official app for *all* domains it purports to handle, even if the
other domains are not flagged for verify.

Bug 21335460

Change-Id: I3fdd8620defa31aea36ce738fa63ac94fc53c5f7
 2015-06-15 15:56:59 -07:00
John Spurlock
9f206bec2d am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '4393a7d2645cfb9097e616016c58887b9929be55':
  Fix typo in TtsSpan.
 2015-06-15 22:50:51 +00:00
Alex Klyubin
24244c4431 am a8232452: Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev 
* commit 'a8232452b6bea3c291a56a4e005e7a95eb99c5de':
  Fix Android Keystore key gen for keys requiring user auth.
 2015-06-15 22:50:40 +00:00
Ruben Brunk
0e250edbfd am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev 
* commit '9f6d39f84423d59705c0c7a8746d40cc610caee7':
  Add addional scale component for radialDistortion.
 2015-06-15 22:46:09 +00:00
Selim Cinek
1a95a5c720 am 4fef43dc: Merge "Fixed a bug when resolving theme attributes" into mnc-dev 
* commit '4fef43dcf81d479d55bd642646c66e5153f73dcc':
  Fixed a bug when resolving theme attributes
 2015-06-15 22:46:05 +00:00
Quddus Chong
79b30681bb Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 2015-06-15 22:42:43 +00:00
Alex Klyubin
a8232452b6 Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev 2015-06-15 22:42:04 +00:00
Quddus Chong
e08a39c0cf docs: Fixed broken links in TV publishing checklist. 
bug: 19298571

Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013
 2015-06-15 15:39:46 -07:00
John Spurlock
4393a7d264 am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.
 2015-06-15 22:39:12 +00:00
Ruben Brunk
9f6d39f844 Merge "Add addional scale component for radialDistortion." into mnc-dev 2015-06-15 22:34:20 +00:00
Amit Mahajan
6f084e4b08 am 28a8cf68: Merge "Adding config variables for triggering CI action on System update." into mnc-dev 
* commit '28a8cf6883478d568f9c85065e94ba39c5c439d4':
  Adding config variables for triggering CI action on System update.
 2015-06-15 22:33:16 +00:00
Ruben Brunk
02cd8cbc9d Add addional scale component for radialDistortion. 
Bug: 20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7
 2015-06-15 15:33:09 -07:00
Selim Cinek
4fef43dcf8 Merge "Fixed a bug when resolving theme attributes" into mnc-dev 2015-06-15 22:30:52 +00:00
John Spurlock
c0d849348a am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '076c599feb9a18b250de7020c2f1c01561c509f9':
  Fix typo in TtsSpan.
 2015-06-15 22:23:24 +00:00
Alex Klyubin
f78dd677e9 Fix Android Keystore key gen for keys requiring user auth. 
When Android Keystore generates an asymmetric key pair, it needs to
create a self-signed certificate for that pair, in order to expose
the key pair in the JCA KeyStore abstraction through which keys are
later retrieved. The self-signed certificate is normally signed with
the private key.

This CL avoids using the private key to sign the certificate if the
private key can be used only once the user has been authenticated.
For such keys, a fake (non-verifying) signature is used on the
certificate, same as for cases where the key is not authorized for
signing.

Bug: 21852844
Change-Id: Id78bc1f51d12950db4e37c1e0da6c60057d4e693
 2015-06-15 15:22:19 -07:00
Amit Mahajan
28a8cf6883 Merge "Adding config variables for triggering CI action on System update." into mnc-dev 2015-06-15 22:16:41 +00:00
John Spurlock
076c599feb am 1ad5c813: Fix typo in TtsSpan. 
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.
 2015-06-15 22:11:30 +00:00