OSDN Git Service
Alex Klyubin [Thu, 9 Apr 2015 22:21:41 +0000 (22:21 +0000)]
am
4acc3392: am
8676a88e: am
97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '
4acc3392c35e5ad98c8e7b650b1368a2956746b7':
Fix minor issues in new Javadocs of AndroidKeyStore.
Yohei Yukaw [Thu, 9 Apr 2015 22:10:45 +0000 (22:10 +0000)]
Merge "Verify that EditorInfo.packageName and uid are consistent"
Alex Klyubin [Thu, 9 Apr 2015 22:07:18 +0000 (22:07 +0000)]
am
8676a88e: am
97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '
8676a88e60ed342cfb5c576aef80960976e3c396':
Fix minor issues in new Javadocs of AndroidKeyStore.
Alex Klyubin [Thu, 9 Apr 2015 21:57:35 +0000 (21:57 +0000)]
am
97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '
97d2d7c42752a52b5fe890cdb9a5dcbbf53837cc':
Fix minor issues in new Javadocs of AndroidKeyStore.
Alex Klyubin [Thu, 9 Apr 2015 21:40:58 +0000 (21:40 +0000)]
Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
Alex Klyubin [Thu, 9 Apr 2015 21:33:11 +0000 (14:33 -0700)]
Fix minor issues in new Javadocs of AndroidKeyStore.
Bug:
18088752
Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d
Clara Bayarri [Thu, 9 Apr 2015 21:31:49 +0000 (21:31 +0000)]
Merge "Editor: Turn on Floating Toolbar Action Mode for Text Selection"
Mike Lockwood [Thu, 9 Apr 2015 21:02:08 +0000 (21:02 +0000)]
Merge "Add support for Bluetooth MIDI devices"
Mike Lockwood [Thu, 9 Apr 2015 21:01:43 +0000 (21:01 +0000)]
Merge "Add support for flushing MIDI all scheduled MIDI events on a port"
Chet Haase [Thu, 9 Apr 2015 20:38:04 +0000 (20:38 +0000)]
Merge "Fix breakage from ActionBar animations"
Alex Klyubin [Thu, 9 Apr 2015 20:34:56 +0000 (20:34 +0000)]
am
098833c5: am
ec01623b: am
aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit '
098833c59d8b3984e3983169b460198c2d5e2670':
Add asymmetric crypto constants for AndroidKeyStore API.
Alex Klyubin [Thu, 9 Apr 2015 20:34:46 +0000 (20:34 +0000)]
am
c6112eb7: am
21c4e465: am
8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '
c6112eb7057f91df1f885da37564f89a423f64e4':
Add missing mapping between JCA and keystore HMAC names.
Alex Klyubin [Thu, 9 Apr 2015 20:24:28 +0000 (20:24 +0000)]
am
ec01623b: am
aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit '
ec01623b0b456c9e8f43123f1f96fb2330a6615f':
Add asymmetric crypto constants for AndroidKeyStore API.
Alex Klyubin [Thu, 9 Apr 2015 20:24:22 +0000 (20:24 +0000)]
am
21c4e465: am
8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '
21c4e465f6a4783a9356bf1d88bda42192af022f':
Add missing mapping between JCA and keystore HMAC names.
Christopher Tate [Thu, 9 Apr 2015 20:20:24 +0000 (20:20 +0000)]
Merge "Add system API for querying the available restore dataset for a package"
Alan Viverette [Thu, 9 Apr 2015 20:16:32 +0000 (20:16 +0000)]
Merge "Only parse LayerDrawable child items when necessary"
Alex Klyubin [Thu, 9 Apr 2015 20:15:02 +0000 (20:15 +0000)]
am
aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit '
aeae0f384f72d4deca698697b125b82b322f7f90':
Add asymmetric crypto constants for AndroidKeyStore API.
Alex Klyubin [Thu, 9 Apr 2015 20:14:56 +0000 (20:14 +0000)]
am
8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '
8c58ba87bb82993b2bd5dbdd948d15fe3297d08e':
Add missing mapping between JCA and keystore HMAC names.
Alan Viverette [Thu, 9 Apr 2015 20:14:32 +0000 (13:14 -0700)]
Only parse LayerDrawable child items when necessary
Bug:
20098214
Change-Id: Ie9da5f6e494ede47f9fdc94481a3f8ca41d3ef00
Fabrice Di Meglio [Thu, 9 Apr 2015 20:13:54 +0000 (20:13 +0000)]
Merge "Fix bug #
20128771 All apps disappeared from app drawer after AAZ08 OTA"
Christopher Tate [Thu, 9 Apr 2015 03:05:30 +0000 (20:05 -0700)]
Add system API for querying the available restore dataset for a package
Bug
20123585
Change-Id: Ife6e77a224b5d4175178aacdb7c285e9944b9eab
Chris Wren [Thu, 9 Apr 2015 20:13:23 +0000 (20:13 +0000)]
Merge "update metrics constants"
Fabrice Di Meglio [Thu, 9 Apr 2015 20:07:50 +0000 (13:07 -0700)]
Fix bug #
20128771 All apps disappeared from app drawer after AAZ08 OTA
- relax a bit Intent resolution. We should still include Apps that
do not support Web domains :-) so in that context add in the result
list the Apps that are with a status INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED
Change-Id: Ibad7b7f577552ac75bba256bb387a75b83524958
Alex Klyubin [Thu, 9 Apr 2015 20:02:39 +0000 (20:02 +0000)]
Merge "Add asymmetric crypto constants for AndroidKeyStore API."
Alex Klyubin [Thu, 9 Apr 2015 19:57:12 +0000 (19:57 +0000)]
Merge "Add missing mapping between JCA and keystore HMAC names."
Chris Wren [Thu, 9 Apr 2015 19:34:13 +0000 (15:34 -0400)]
update metrics constants
Change-Id: I73ea3fe98a3b41b1072688a846ef1c396a9e9a30
wsmlby [Thu, 9 Apr 2015 19:36:52 +0000 (19:36 +0000)]
Merge "Add permission for AppCompatibilityTest."
wsmlby [Thu, 9 Apr 2015 19:32:33 +0000 (12:32 -0700)]
Add permission for AppCompatibilityTest.
Bug:
20134812
Change-Id: Iaf9a9963a16af1e2bb157159648db70666a33c48
Dan Albert [Thu, 9 Apr 2015 19:06:11 +0000 (19:06 +0000)]
am
e24d36b7: am
1f799a6b: am
d9f32b16: Merge "Ensure alignment of Res_png_9patch."
* commit '
e24d36b7b744540ccd3401609248ed9d48be4cc9':
Ensure alignment of Res_png_9patch.
Rich Slogar [Thu, 9 Apr 2015 19:06:00 +0000 (19:06 +0000)]
am
acae606f: am
a6b6952b: am
0b1610ff: am
2489a7fd: am
9d6e9587: am
36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs
* commit '
acae606f5dde5fff990ffc840da89fcc61f03c5b':
docs: remove studio proguard settings from play services
Mike Lockwood [Tue, 24 Mar 2015 15:27:11 +0000 (08:27 -0700)]
Add support for Bluetooth MIDI devices
The Bluetooth MIDI devices are handled in the BluetoothMidiService APK.
Apps wishing to connect to Bluetooth MIDI devices call MidiManager.openBluetoothDevice()
which binds to BluetoothMidiService in a similar way as virtual devices are implemented.
Change-Id: Ie3fbca757928fd7873a009f9bf9e0ce0be487da6
Mike Lockwood [Wed, 8 Apr 2015 15:45:37 +0000 (08:45 -0700)]
Add support for flushing MIDI all scheduled MIDI events on a port
Change-Id: I39d7862540d4d4b9e2df1265f9dd253541adb4c2
Chet Haase [Thu, 9 Apr 2015 18:42:30 +0000 (11:42 -0700)]
Fix breakage from ActionBar animations
Real fix will come later, but this disables the animations to work
around the current crash.
Issue #
20125407 Settings Crashes when changing orientation of device
Change-Id: I748e8889f72483c82cff084c5815322057f16f03
Alex Klyubin [Thu, 9 Apr 2015 18:38:44 +0000 (11:38 -0700)]
Add asymmetric crypto constants for AndroidKeyStore API.
Bug:
18088752
Change-Id: Iee72a4c230f3a2cd30d9eb4d29c4301f3e113f31
Dan Albert [Thu, 9 Apr 2015 18:31:38 +0000 (18:31 +0000)]
am
1f799a6b: am
d9f32b16: Merge "Ensure alignment of Res_png_9patch."
* commit '
1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea':
Ensure alignment of Res_png_9patch.
Rich Slogar [Thu, 9 Apr 2015 18:31:31 +0000 (18:31 +0000)]
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
Dan Albert [Thu, 9 Apr 2015 18:26:34 +0000 (18:26 +0000)]
am
d9f32b16: Merge "Ensure alignment of Res_png_9patch."
* commit '
d9f32b164be11b6c42ee36ca6945623073e82c99':
Ensure alignment of Res_png_9patch.
Rich Slogar [Thu, 9 Apr 2015 18:21:06 +0000 (18:21 +0000)]
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
George Mount [Thu, 9 Apr 2015 18:14:00 +0000 (18:14 +0000)]
Merge "Revert "Allow delay of showing/hiding shared element when transferring.""
George Mount [Thu, 9 Apr 2015 18:13:40 +0000 (18:13 +0000)]
Revert "Allow delay of showing/hiding shared element when transferring."
This reverts commit
bd93e69c8e0b06fc0b0bbba4bdd9e426b37f98e1.
Change-Id: I38daa39e8560f4901b242acc6394dfa37f3d084a
Rich Slogar [Thu, 9 Apr 2015 18:11:24 +0000 (18:11 +0000)]
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
Dan Albert [Thu, 9 Apr 2015 18:09:09 +0000 (18:09 +0000)]
Merge "Ensure alignment of Res_png_9patch."
ztenghui [Thu, 9 Apr 2015 18:06:25 +0000 (18:06 +0000)]
Merge "Update the light Y shift value"
ztenghui [Thu, 9 Apr 2015 18:01:40 +0000 (11:01 -0700)]
Update the light Y shift value
This is accidentally missed from the previous shadow update
Change-Id: I52d499bede843d6a71db55cca9be38716c9bb620
Rich Slogar [Thu, 9 Apr 2015 17:57:20 +0000 (17:57 +0000)]
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
Narayan Kamath [Thu, 9 Apr 2015 17:56:58 +0000 (17:56 +0000)]
Merge "Add org.apache.http.legacy dependency for StatementService."
Narayan Kamath [Thu, 9 Apr 2015 17:53:17 +0000 (18:53 +0100)]
Add org.apache.http.legacy dependency for StatementService.
Breaks non-jack builds.
bug:
20129764
Change-Id: Ib4fce285ef3501e746fe151269c8f2a813e5f9a2
ztenghui [Thu, 9 Apr 2015 17:48:59 +0000 (17:48 +0000)]
Merge "Update the shadow fall off function from cosine to gaussian."
Rich Slogar [Thu, 9 Apr 2015 17:47:40 +0000 (17:47 +0000)]
am
36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs
* commit '
36e3f5125895875c63242294da289ca4b09c9f9e':
docs: remove studio proguard settings from play services
Dan Albert [Wed, 8 Apr 2015 01:38:42 +0000 (18:38 -0700)]
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
Rich Slogar [Thu, 9 Apr 2015 17:39:28 +0000 (17:39 +0000)]
Merge "docs: remove studio proguard settings from play services" into lmp-docs
Alex Klyubin [Thu, 9 Apr 2015 17:31:16 +0000 (17:31 +0000)]
am
bbf3cc57: am
fd168151: am
e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."
* commit '
bbf3cc5797293dc915d7ecfe41e85bbe5682548d':
Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
Fabrice Di Meglio [Thu, 9 Apr 2015 17:29:21 +0000 (17:29 +0000)]
Merge "Add IntentFilter auto verification - part 4"
Alex Klyubin [Thu, 9 Apr 2015 17:21:52 +0000 (17:21 +0000)]
am
fd168151: am
e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."
* commit '
fd1681513357309868c2659f215c931e4d27c40e':
Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
Alex Klyubin [Thu, 9 Apr 2015 17:10:57 +0000 (17:10 +0000)]
am
e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."
* commit '
e26347bb740f5d1bcf51036e63c1b1c91e685f4c':
Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
Alex Klyubin [Thu, 9 Apr 2015 16:28:38 +0000 (09:28 -0700)]
Add missing mapping between JCA and keystore HMAC names.
This is a follow-up to
70376a77280551791dae62586a6bb0c77ed9429a where
I forgot to update this mapping.
Bug:
18088752
Change-Id: I322a9abd642ddee3bd2b4f49379b121012e32836
Tim Kilbourn [Thu, 9 Apr 2015 17:06:47 +0000 (17:06 +0000)]
Merge "Simplify input-audio device mapping"
ztenghui [Tue, 17 Feb 2015 21:26:10 +0000 (13:26 -0800)]
Update the shadow fall off function from cosine to gaussian.
Also tune the parameters to match a better look designed by UX team.
For ambient part, the acos transformed alpha is not needed any more.
b/
19370798
Change-Id: I20d2615d1be502eb900942ed756aecd1660dee48
Alex Klyubin [Thu, 9 Apr 2015 16:54:05 +0000 (09:54 -0700)]
resolved conflicts for merge of
b9a9d46c to master
Change-Id: Ibec45f0f8f9618dd7bd1b34561dccbdd9599cdeb
Alex Klyubin [Thu, 9 Apr 2015 16:51:02 +0000 (16:51 +0000)]
Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."
Alex Klyubin [Thu, 9 Apr 2015 16:42:09 +0000 (09:42 -0700)]
Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
This wasn't meant to be public API yet.
Bug:
18088752
Change-Id: I40e57fd9121348086ae88ad9fa54f930547b77ba
Alan Viverette [Thu, 9 Apr 2015 16:44:21 +0000 (16:44 +0000)]
Merge "Fix fast scroller thumb and track margins for Material"
Alex Klyubin [Thu, 9 Apr 2015 16:43:32 +0000 (16:43 +0000)]
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.
Alex Klyubin [Thu, 9 Apr 2015 16:30:50 +0000 (16:30 +0000)]
am
a482b046: Merge "Require IND-CPA by default for new AndroidKeyStore keys."
* commit '
a482b0469cb98a5743603e1602aa6f37c65d1659':
Require IND-CPA by default for new AndroidKeyStore keys.
Clara Bayarri [Thu, 9 Apr 2015 14:26:41 +0000 (15:26 +0100)]
Editor: Turn on Floating Toolbar Action Mode for Text Selection
Change-Id: I267809e8cd5f10a3f9efd8f555ad24c7a935fdb8
Alex Klyubin [Thu, 9 Apr 2015 16:12:08 +0000 (16:12 +0000)]
Merge "Require IND-CPA by default for new AndroidKeyStore keys."
George Mount [Thu, 9 Apr 2015 15:25:58 +0000 (15:25 +0000)]
Merge "Allow delay of showing/hiding shared element when transferring."
George Mount [Thu, 9 Apr 2015 15:25:50 +0000 (15:25 +0000)]
Merge "Make TransitionManager.endTransitions() public."
Abodunrinwa Toki [Thu, 9 Apr 2015 15:04:40 +0000 (15:04 +0000)]
Merge "FloatingToolbar with overflow. -Implemented the toolbar overflow -Refactored a bit to make the concepts clear and component easier to understand and maintain -Floating toolbar now uses a clipped popup window that allows touch events to go through the transparent parts"
Richard Uhler [Thu, 9 Apr 2015 14:51:13 +0000 (14:51 +0000)]
am
00ff42a0: am
7f757130: am
f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat."
* commit '
00ff42a0ca9d17c4b7ee89d900cf86c9a25c00eb':
Reuse dexopt method for both dex2oat and patchoat.
Richard Uhler [Thu, 9 Apr 2015 14:40:47 +0000 (14:40 +0000)]
am
7f757130: am
f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat."
* commit '
7f7571308d5dc973e9b1e352d56643a74e99e588':
Reuse dexopt method for both dex2oat and patchoat.
Richard Uhler [Thu, 9 Apr 2015 14:31:10 +0000 (14:31 +0000)]
am
f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat."
* commit '
f324d245fdd07ac14ab312d1a5fa04a4e8dfcceb':
Reuse dexopt method for both dex2oat and patchoat.
Richard Uhler [Thu, 9 Apr 2015 14:13:26 +0000 (14:13 +0000)]
Merge "Reuse dexopt method for both dex2oat and patchoat."
Abodunrinwa Toki [Tue, 7 Apr 2015 21:13:51 +0000 (22:13 +0100)]
FloatingToolbar with overflow.
-Implemented the toolbar overflow
-Refactored a bit to make the concepts clear and component easier to understand and maintain
-Floating toolbar now uses a clipped popup window that allows touch events to go through the transparent parts
Change-Id: I84794e45a8a10f004654550fe976585f9e62bdb5
Dongwon Kang [Thu, 9 Apr 2015 03:35:03 +0000 (03:35 +0000)]
Merge "TIF: Update the input list even when a single component in a package is updated."
Dongwon Kang [Thu, 9 Apr 2015 01:26:23 +0000 (18:26 -0700)]
TIF: Update the input list even when a single component in a package is updated.
Bug:
20127116
Change-Id: I1aefaaba9076877cefc5cfdf36d3c6169c437b6d
Fabrice Di Meglio [Wed, 8 Apr 2015 23:17:46 +0000 (16:17 -0700)]
Add IntentFilter auto verification - part 4
- add domain verification priming at boot when the PackageManagerService
singleton is created. This will mainly set the domain verification status
to INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS for all Apps that
have an IntentFilter with action VIEW and data scheme HTTP or HTTPS.
- also optimize Intent resolution by taking into account Browser Apps
Change-Id: Id8e66c9759a99e79b07051595ca89a168dc5ae0e
Colin Cross [Thu, 9 Apr 2015 01:44:38 +0000 (01:44 +0000)]
am
106f83ee: am
4cead39a: am
1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge"
* commit '
106f83ee9cc145a6421d21067c44b513cc148e80':
Re-enable -Wall and -Werror that were lost in a merge
Colin Cross [Thu, 9 Apr 2015 01:23:28 +0000 (01:23 +0000)]
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
Olawale Ogunwale [Thu, 9 Apr 2015 01:18:01 +0000 (01:18 +0000)]
am
33a68a52: am
343e291b: am
e8a3c320: Merge "Prevent windows from freezing screen while timeout"
* commit '
33a68a521f77a2070832ece271d1047ecf56de7e':
Prevent windows from freezing screen while timeout
Alex Klyubin [Thu, 9 Apr 2015 01:16:38 +0000 (01:16 +0000)]
am
2d81cb68: am
2cb1e1dc: am
1da3d7fc: Merge "Add more digests to AndroidKeyStore API."
* commit '
2d81cb6824e186a6c76d0466e2d58eaa34312673':
Add more digests to AndroidKeyStore API.
Colin Cross [Thu, 9 Apr 2015 01:13:50 +0000 (01:13 +0000)]
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
Olawale Ogunwale [Thu, 9 Apr 2015 00:56:27 +0000 (00:56 +0000)]
am
343e291b: am
e8a3c320: Merge "Prevent windows from freezing screen while timeout"
* commit '
343e291b67432427709a20e97f42fbc329c45c44':
Prevent windows from freezing screen while timeout
Alex Klyubin [Thu, 9 Apr 2015 00:56:23 +0000 (00:56 +0000)]
am
2cb1e1dc: am
1da3d7fc: Merge "Add more digests to AndroidKeyStore API."
* commit '
2cb1e1dca0ae9d1b34774b16f07974ea56c42cb4':
Add more digests to AndroidKeyStore API.
Colin Cross [Thu, 9 Apr 2015 00:49:55 +0000 (00:49 +0000)]
Merge "Re-enable -Wall and -Werror that were lost in a merge"
Colin Cross [Thu, 9 Apr 2015 00:29:00 +0000 (17:29 -0700)]
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
David Christie [Wed, 8 Apr 2015 22:31:30 +0000 (15:31 -0700)]
Add smallest displacement field to FLP HAL
Change-Id: I4d857256c035c65185be3be8401bec8d45091aaf
Olawale Ogunwale [Thu, 9 Apr 2015 00:32:45 +0000 (00:32 +0000)]
am
e8a3c320: Merge "Prevent windows from freezing screen while timeout"
* commit '
e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e':
Prevent windows from freezing screen while timeout
Alex Klyubin [Thu, 9 Apr 2015 00:32:38 +0000 (00:32 +0000)]
am
1da3d7fc: Merge "Add more digests to AndroidKeyStore API."
* commit '
1da3d7fcf33fd61f0143f8a410f0a77783fe1bfe':
Add more digests to AndroidKeyStore API.
Alex Klyubin [Wed, 8 Apr 2015 20:36:22 +0000 (13:36 -0700)]
Require IND-CPA by default for new AndroidKeyStore keys.
Bug:
18088752
Change-Id: I01e44b7155df4326b5c9d83dda57f889c1f23ec7
Wale Ogunwale [Wed, 8 Apr 2015 23:02:48 +0000 (23:02 +0000)]
Merge "Throw caught DeadObjectException when trying to create a service."
Wale Ogunwale [Wed, 8 Apr 2015 21:33:21 +0000 (14:33 -0700)]
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
Qiwen Zhao [Wed, 8 Apr 2015 22:58:36 +0000 (15:58 -0700)]
Merge KDataBinder/ from platform/vendor/google/prototypes/data-binding to tools/data-binding/
Tim Kilbourn [Wed, 8 Apr 2015 17:23:35 +0000 (10:23 -0700)]
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
Dongwon Kang [Wed, 8 Apr 2015 22:38:49 +0000 (22:38 +0000)]
Merge "TIF: add a video unavailable constant for audio program case."
Dongwon Kang [Wed, 8 Apr 2015 00:31:16 +0000 (17:31 -0700)]
TIF: add a video unavailable constant for audio program case.
Bug:
20019339
Change-Id: Ife3452486c065e6c5809f0cd2bb87794c4279312
Jorim Jaggi [Wed, 8 Apr 2015 22:20:09 +0000 (22:20 +0000)]
Merge "Fix some jank when expanding quick settings"
Alex Klyubin [Wed, 8 Apr 2015 22:12:55 +0000 (22:12 +0000)]
Alex Klyubin [Wed, 8 Apr 2015 22:12:47 +0000 (22:12 +0000)]
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.
Alex Klyubin [Wed, 8 Apr 2015 22:12:38 +0000 (22:12 +0000)]
am
8ad875f5: am
0649c832: am
3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API."
* commit '
8ad875f52de3ffa99fea22177e26a7f22c3735b1':
Add BlockMode.GCM constant to AndroidKeyStore API.