David Christie
295a93b99f
Add smallest displacement field to FLP HAL
...
Change-Id: I4d857256c035c65185be3be8401bec8d45091aaf
2015-04-08 17:33:38 -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
Wale Ogunwale
1c146c78af
Merge "Throw caught DeadObjectException when trying to create a service."
2015-04-08 23:02:49 +00:00
Wale Ogunwale
bfac468ce9
Throw caught DeadObjectException when trying to create a service.
...
We don't want to continue trying to start the service if the service
appliction is dead. This will lead to an NPE later on since we have
set ServiceRecord.app to null in the finally block.
Bug: 5227987
Change-Id: I3ee5111f4a20d9455fedbf41ac54d41c43aa8d76
2015-04-08 16:01:24 -07:00
Qiwen Zhao
4e7bb6312f
Merge KDataBinder/ from platform/vendor/google/prototypes/data-binding to tools/data-binding/
2015-04-08 15:58:36 -07:00
Tim Kilbourn
6d85cf2bd7
Simplify input-audio device mapping
...
Instead of matching on unique ids, allow an .idc file to specify
whether the input device also has a mic.
Bug: 15374820
Change-Id: Ib5f934f1f37f6b98bb906a5be86c6bfa9a5f09c8
2015-04-08 15:44:03 -07:00
Dongwon Kang
0ceef71ac4
Merge "TIF: add a video unavailable constant for audio program case."
2015-04-08 22:38:50 +00:00
Dongwon Kang
ff1f29e1b1
TIF: add a video unavailable constant for audio program case.
...
Bug: 20019339
Change-Id: Ife3452486c065e6c5809f0cd2bb87794c4279312
2015-04-08 15:21:06 -07:00
Jorim Jaggi
aa4b12745b
Merge "Fix some jank when expanding quick settings"
2015-04-08 22:20:10 +00:00
Alex Klyubin
0e496527fe
am da66cab3: am f1a1160c: am c0d6b7cb: Merge "Fix typo"
...
* commit 'da66cab36e8085a1457565be69b55b38dfee186e':
Fix typo
2015-04-08 22:12:55 +00:00
Alex Klyubin
7513d53cae
am 9be1016b: am c48e8cf0: am edd0e6c0: Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore."
...
* commit '9be1016b44c229468bd9a215fdbbfb95a8acf2ad':
Refuse to reuse IV in encryption mode in AndroidKeyStore.
2015-04-08 22:12:47 +00:00
Alex Klyubin
bd877f261b
am 8ad875f5: am 0649c832: am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API."
...
* commit '8ad875f52de3ffa99fea22177e26a7f22c3735b1':
Add BlockMode.GCM constant to AndroidKeyStore API.
2015-04-08 22:12:38 +00:00
Alex Klyubin
da66cab36e
am f1a1160c: am c0d6b7cb: Merge "Fix typo"
...
* commit 'f1a1160c68f6c289d3b82573f1a16f9c52aebab4':
Fix typo
2015-04-08 22:03:55 +00:00
Fyodor Kupolov
49208d0b91
Merge "Replaced zeros with UserHandle.USER_OWNER"
2015-04-08 22:03:53 +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
George Mount
478673ede2
Make TransitionManager.endTransitions() public.
...
Bug 19231835
Change-Id: I151bae1d10aaab72f8fea73eaf0538f0aa5d810a
2015-04-08 14:51:36 -07:00
George Mount
bd93e69c8e
Allow delay of showing/hiding shared element when transferring.
...
Bug 18932344
Change-Id: Ic967551a4dd27967d2312a6c6c8a83b34c220031
2015-04-08 14:48:02 -07:00
Jorim Jaggi
f3bf1ee431
Fix some jank when expanding quick settings
...
Change-Id: Iba0ceb8b6085bec9fdee588eead073527a44540d
2015-04-08 14:41:43 -07: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
Raph Levien
97f09ae8b0
Merge "Clear hyphenEdit from Layout's paint"
2015-04-08 21:09:09 +00:00
Nancy Chen
a9e9578d73
Merge "Hide and make systemapi visual voicemail-related apis."
2015-04-08 20:57:55 +00:00
Chien-Yu Chen
06fe59bfa2
Merge "camera2: add reprocess format map"
2015-04-08 20:42:44 +00:00
Raph Levien
9a174dda42
Clear hyphenEdit from Layout's paint
...
The paint of a layout may be reused with other things (in particular,
it can be passed to a BoringLayout), so make sure the hyphenEdit is
zeroed out after use.
Change-Id: If58c5588af9642c3ba827acefea7895e814daab9
2015-04-08 13:38:51 -07:00
Eino-Ville Talvala
046a978f68
Revert "Revert "Camera2: Add camera pose and distortion fields""
...
This reverts commit fb4894429810776ae1d2d812872d3158e4d9eb92.
Change-Id: I205904bf9be8149cda0b9aeda68948f14b5d64fb
2015-04-08 20:05:56 +00:00
Svetoslav
cd890311fb
Merge "Apps can request permissions only on platforms that have runtime permissions."
2015-04-08 19:28:02 +00:00
Quddus Chong
4a07dcadf8
am 163e5016: 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
...
* commit '163e501609c8f17c1ab20b78c3d5d6691abc2bc2':
cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
2015-04-08 19:21:23 +00:00
Timothy Knight
181767329b
Merge "Revert "Camera2: Add camera pose and distortion fields""
2015-04-08 19:14:38 +00:00
Timothy Knight
fb48944298
Revert "Camera2: Add camera pose and distortion fields"
...
This reverts commit da1e6411be6d69650d7e8ae42e738f2dbb356777.
Change-Id: Id04cc86cf9740a2a9bf5eb047b633a2abd90f561
2015-04-08 19:13:43 +00: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
Ben Kwa
6e08dbc366
Merge "Prototype the destination picking."
2015-04-08 19:05:26 +00:00
Santos Cordon
6d5c0ba98c
Merge "Add SIM activation constants to TelephonyManager"
2015-04-08 19:01:36 +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
Zhijun He
b0c98dac3d
Merge "ImageReader/Writer: implement opaque format operations"
2015-04-08 18:57:59 +00:00
Ben Kwa
ef3f2620b3
Prototype the destination picking.
...
- Add an intent to open a destination picker, and refactor
DocumentsActivity accordingly.
- Modify CopyService to take a destination for the copy, and to use URIs
and PFDs instead of Files and Streams, for better error handling &
cleanup.
Change-Id: I69dc43823a703674dc29d2215e2df23b33ad7882
2015-04-08 11:55:18 -07:00
Timothy Knight
dfe5ec56f2
Merge "Camera2: Add camera pose and distortion fields"
2015-04-08 18:52:28 +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
60a6e09654
am 5985981b: am b49748cf: am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev
...
* commit '5985981ba45b97e381312ba53f191396607b447d':
Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
2015-04-08 18:44:02 +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
Eino-Ville Talvala
da1e6411be
Camera2: Add camera pose and distortion fields
...
- android.lens.info.poseRotation
- android.lens.info.poseTranslation
- android.lens.info.intrinsicCalibration
- android.lens.info.radialDistortion
Change-Id: I3f8cf258b600bc58d0743e44aa6c456cd4b8a906
2015-04-08 18:37:03 +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
Fyodor Kupolov
ff7233e2e3
Added getUserCreationTime to query user/profile creation time
...
Added public api to query creation time of the user or of a managed profile
associated with the calling user.
Bug: 20049349
Change-Id: I7f9263fe434233e6f7d4f165c974cab64ca7107c
2015-04-08 11:28:52 -07: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