OSDN Git Service
Geoff Mendal [Sat, 4 Apr 2015 06:06:11 +0000 (06:06 +0000)]
am
4c3689a2: (-s ours) am
8dda89ca: (-s ours) am
bad1356b: (-s ours) Import translations. DO NOT MERGE
* commit '
4c3689a25334d9d5502778738209cdfc5e26e08e':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:55:38 +0000 (05:55 +0000)]
am
8dda89ca: (-s ours) am
bad1356b: (-s ours) Import translations. DO NOT MERGE
* commit '
8dda89cae7a7ff846ba03cbf6cb0d3434b473c4b':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:51:57 +0000 (05:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 4 Apr 2015 05:51:30 +0000 (22:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaeb14afbbba8c976399110e09e898a4708cf6437
Auto-generated-cl: translation import
Geoff Mendal [Sat, 4 Apr 2015 05:50:26 +0000 (05:50 +0000)]
am
06bcd0c7: (-s ours) Import translations. DO NOT MERGE
* commit '
06bcd0c72b7f8af9033942fe147d76aa89e83b49':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:45:10 +0000 (05:45 +0000)]
am
bad1356b: (-s ours) Import translations. DO NOT MERGE
* commit '
bad1356b2d2a229c57160af77aab78be5d3adb49':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:39:15 +0000 (22:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4469eb735357257825c04e1796db3bbe3f9f00eb
Auto-generated-cl: translation import
Geoff Mendal [Sat, 4 Apr 2015 05:35:22 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13a822578c3b71e3176704891486783770337b97
Auto-generated-cl: translation import
Geoff Mendal [Sat, 4 Apr 2015 05:32:08 +0000 (22:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie0d2764cd9e3289d56cc994a2a45f6f67b5ed1e6
Auto-generated-cl: translation import
Andreas Gampe [Sat, 4 Apr 2015 05:02:27 +0000 (05:02 +0000)]
am
f29be77f: am
a4f39ed9: am
f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
* commit '
f29be77f07084e88ae7104a375a1a54fd91de0dd':
Frameworks/base: Pass variant and feature-set to runtime
Andreas Gampe [Sat, 4 Apr 2015 04:52:36 +0000 (04:52 +0000)]
am
a4f39ed9: am
f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
* commit '
a4f39ed91c9e17e1f165ed747c02d8f305b067ec':
Frameworks/base: Pass variant and feature-set to runtime
Andreas Gampe [Sat, 4 Apr 2015 04:41:06 +0000 (04:41 +0000)]
am
f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
* commit '
f8cb672f121495e4f80b96a14140180f71e770fe':
Frameworks/base: Pass variant and feature-set to runtime
Andreas Gampe [Sat, 4 Apr 2015 04:23:11 +0000 (04:23 +0000)]
Merge "Frameworks/base: Pass variant and feature-set to runtime"
Quddus Chong [Sat, 4 Apr 2015 01:27:53 +0000 (01:27 +0000)]
am
6f403e69: am
d093ad1a: am
7abeba63: am
0d53fcad: am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
6f403e695163a03fcaff8fd32e2c007aa0268e7f':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Rom Lemarchand [Sat, 4 Apr 2015 01:13:44 +0000 (01:13 +0000)]
Merge "Change audio include path from system/core to system/media/audio"
Quddus Chong [Sat, 4 Apr 2015 01:13:22 +0000 (01:13 +0000)]
am
d093ad1a: am
7abeba63: am
0d53fcad: am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
d093ad1af148a6b5b444cf6cf18b865cad731365':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:59:39 +0000 (00:59 +0000)]
am
7abeba63: am
0d53fcad: am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
7abeba63b59b81a4b5d8a3edd1c54cbb037945fc':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:49:49 +0000 (00:49 +0000)]
am
0d53fcad: am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
0d53fcadce010d50f815a007d50f0b7f7d3bce4d':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:39:10 +0000 (00:39 +0000)]
am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
d642f8297529b3df96d0f822b062cb8354c90c18':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:29:11 +0000 (00:29 +0000)]
am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
54dee349976eaafe7df3a2bb48e9fce2b964a7f0':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:06:28 +0000 (17:06 -0700)]
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Change-Id: I0e2a49b639101a7607e8e90cf830d9d449ad6328
John Spurlock [Fri, 3 Apr 2015 23:53:03 +0000 (23:53 +0000)]
Merge "Zen: Changes to support new automation settings sub-section."
Joseph Cooper [Fri, 3 Apr 2015 23:35:39 +0000 (23:35 +0000)]
Merge "Documents the ImageView.ScaleType attributes"
Andreas Gampe [Fri, 3 Apr 2015 06:12:56 +0000 (23:12 -0700)]
Frameworks/base: Pass variant and feature-set to runtime
This is required so we pick up the settings correctly when compiling
the boot image on device, or compile any dex files through a
DexClassLoader.
Bug:
20055104
Change-Id: Ia3ab2e48855060894b36f7fd360fe17b978e45a6
Luan Nguyen [Fri, 3 Apr 2015 22:54:37 +0000 (22:54 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Luan Nguyen [Fri, 3 Apr 2015 22:54:26 +0000 (22:54 +0000)]
am
88de9c94: am
b0c35f80: am
31947438: am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
88de9c94eb519f4c69ac7489879eddf7753276b6':
docs: Remove note about inablity to submit apps to Google Play.
Jean-Michel Trivi [Fri, 3 Apr 2015 22:54:22 +0000 (22:54 +0000)]
Merge "AudioTrack builder API."
Luan Nguyen [Fri, 3 Apr 2015 22:43:25 +0000 (22:43 +0000)]
am
b0c35f80: am
31947438: am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
b0c35f80f6efd61c553cc4bfc21b896dd5dc27e6':
docs: Remove note about inablity to submit apps to Google Play.
Wei Jia [Fri, 3 Apr 2015 22:36:38 +0000 (22:36 +0000)]
Merge "MediaSync: add MediaSync JAVA API"
Wei Jia [Mon, 9 Mar 2015 23:38:25 +0000 (16:38 -0700)]
MediaSync: add MediaSync JAVA API
Bug:
19666434
Change-Id: Iab6941f6d81cb95a3b86be14b239287acb0d0eee
Jean-Michel Trivi [Wed, 1 Apr 2015 16:40:11 +0000 (09:40 -0700)]
AudioTrack builder API.
Add a Builder class for AudioTrack.
Bug
19699343
Change-Id: I65cbcb32242c3d1857e5fca1a2f1dbe58c3b25ed
Luan Nguyen [Fri, 3 Apr 2015 22:28:45 +0000 (22:28 +0000)]
am
31947438: am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
3194743890db9337412acf77edfc6924ba1dec6e':
docs: Remove note about inablity to submit apps to Google Play.
Joseph Cooper [Fri, 3 Apr 2015 21:00:31 +0000 (14:00 -0700)]
Documents the ImageView.ScaleType attributes
Although the ImageView.ScaleType enum is documented, that
documentation was not reproduced in the xml attributes. Copying the
documentation across should fill the previously empty 'Description'
column in
http://developer.android.com/reference/android/R.attr.html#scaleType
and
http://developer.android.com/reference/android/widget/ImageView.html#attr_android:scaleType
Also adds javadocs to ImageView.setImageMatrix(Matrix) because the
ScaleType documentation refers to it and it was also empty.
Change-Id: I7768549970eab2ebfe38cc4677a58dc91e104588
Rom Lemarchand [Fri, 3 Apr 2015 22:11:28 +0000 (15:11 -0700)]
Change audio include path from system/core to system/media/audio
Change-Id: Iefd5933e7ba10fa2a8ca3489bcbee3bc8f1396ad
Luan Nguyen [Fri, 3 Apr 2015 22:11:14 +0000 (22:11 +0000)]
am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
9b9bda56238feabb07b7f6f0ad93f007c24de25d':
docs: Remove note about inablity to submit apps to Google Play.
Luan Nguyen [Fri, 3 Apr 2015 22:01:12 +0000 (22:01 +0000)]
am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
b7647017ddf8f57c7333b5ae3e459639ef0a6a7c':
docs: Remove note about inablity to submit apps to Google Play.
Quddus Chong [Fri, 3 Apr 2015 21:49:43 +0000 (21:49 +0000)]
am
b3c310b6: am
ba386b55: am
f2c2be78: am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
b3c310b60dfab11b9b8d41b00ae06a82090f3d14':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Luan Nguyen [Fri, 3 Apr 2015 21:49:32 +0000 (21:49 +0000)]
am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
eeb42053df94de88674caf904a96ec987d55e668':
docs: Remove note about inablity to submit apps to Google Play.
Luan Nguyen [Fri, 3 Apr 2015 21:40:52 +0000 (21:40 +0000)]
Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
Quddus Chong [Fri, 3 Apr 2015 21:39:58 +0000 (21:39 +0000)]
am
ba386b55: am
f2c2be78: am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
ba386b55d6c5a8e19023e93bc281d282951371a7':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Quddus Chong [Fri, 3 Apr 2015 21:29:44 +0000 (21:29 +0000)]
am
f2c2be78: am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
f2c2be78ba26793c05dab7c77c84566265bb6668':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Joe LaPenna [Fri, 3 Apr 2015 21:29:09 +0000 (21:29 +0000)]
am
97a73606: am
e59f4260: am
1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
* commit '
97a7360660dc6473286a12d72eecff277e6182e1':
Make burn in protection updates happen on the minute.
Andrew Lee [Fri, 3 Apr 2015 21:24:06 +0000 (21:24 +0000)]
Merge "Protect against null ITelephony to fix crash."
Nancy Chen [Fri, 3 Apr 2015 21:23:37 +0000 (21:23 +0000)]
Merge "Include the source package in the voicemail URI."
Quddus Chong [Fri, 3 Apr 2015 21:19:15 +0000 (21:19 +0000)]
am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
d9e2c05dbf6c6f418b08a8465f1ed8f051015b41':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Joe LaPenna [Fri, 3 Apr 2015 21:13:30 +0000 (21:13 +0000)]
am
e59f4260: am
1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
* commit '
e59f426050f693b62bb5471fca5fb8b7ea2af8ea':
Make burn in protection updates happen on the minute.
Andrew Lee [Fri, 3 Apr 2015 21:09:29 +0000 (14:09 -0700)]
Protect against null ITelephony to fix crash.
Bug:
20066803
Change-Id: I4336e979dab3a4b1b3d53078af572ff3f822377a
Quddus Chong [Fri, 3 Apr 2015 21:08:49 +0000 (21:08 +0000)]
am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
0c3b894c2c18b226f58af98569f21bcb4a593b14':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Ben Kwa [Fri, 3 Apr 2015 21:06:29 +0000 (21:06 +0000)]
Merge "Enable directory selection. Add an IntentService to copy files."
Ye Wen [Fri, 3 Apr 2015 21:03:52 +0000 (21:03 +0000)]
Merge "Return pending intent to service caller if MmsService can't be connected"
Joe LaPenna [Fri, 3 Apr 2015 21:03:33 +0000 (21:03 +0000)]
am
1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
* commit '
1f956e424320b22255f293e9b6d7d0b30b19a79f':
Make burn in protection updates happen on the minute.
Chris Craik [Fri, 3 Apr 2015 21:02:09 +0000 (21:02 +0000)]
Merge "Delete pre-glop path"
Elliott Hughes [Fri, 3 Apr 2015 20:58:25 +0000 (20:58 +0000)]
am
66d94512: am
dbb5f5d6: am
efcbaec1: Merge "Only Windows doesn\'t have %zd."
* commit '
66d9451273c4a3775b6b63a0e4b7027bd2eae65d':
Only Windows doesn't have %zd.
Quddus Chong [Fri, 3 Apr 2015 20:57:44 +0000 (20:57 +0000)]
am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
91070dc419b9b60843094ecc02f95b38c784208a':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Joe LaPenna [Fri, 3 Apr 2015 20:55:00 +0000 (20:55 +0000)]
Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
Elliott Hughes [Fri, 3 Apr 2015 20:49:38 +0000 (20:49 +0000)]
am
dbb5f5d6: am
efcbaec1: Merge "Only Windows doesn\'t have %zd."
* commit '
dbb5f5d6c4186e919fa51c019d56ea5fa8ff8b96':
Only Windows doesn't have %zd.
Ben Kwa [Tue, 31 Mar 2015 17:11:43 +0000 (10:11 -0700)]
Enable directory selection. Add an IntentService to copy files.
Change-Id: I0bec0224aa1b52766664c23f77d60affec702111
Quddus Chong [Fri, 3 Apr 2015 20:47:45 +0000 (20:47 +0000)]
Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
Elliott Hughes [Fri, 3 Apr 2015 20:40:52 +0000 (20:40 +0000)]
am
efcbaec1: Merge "Only Windows doesn\'t have %zd."
* commit '
efcbaec14135c42f81e2a8f645584cf7cf542a02':
Only Windows doesn't have %zd.
Ye Wen [Wed, 1 Apr 2015 18:27:14 +0000 (11:27 -0700)]
Return pending intent to service caller if MmsService can't be connected
If MmsService can not be connected, broker throws a runtime exception
which does not return to service caller via PendingIntent. MMS app would
wait forever for the return of sent/downloaded PendingIntent. This
change makes sure PendingIntent is always returned so MMS app can be
unblocked.
b/
19732709
Change-Id: I694a0fc29bb431b48c7077e7a323844709ae695f
Alex Klyubin [Fri, 3 Apr 2015 20:33:29 +0000 (20:33 +0000)]
am
ba88b692: am
e2e5b88e: am
64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."
* commit '
ba88b692f1a489de308dcf5b5420a23166a94487':
Load fewer classes when AndroidKeyStore provider is installed.
Amith Yamasani [Fri, 3 Apr 2015 20:31:18 +0000 (13:31 -0700)]
Turn off a debug flag
Change-Id: I5d7edc2838341754dd092410e6e21787a3454834
Amith Yamasani [Fri, 3 Apr 2015 20:26:38 +0000 (20:26 +0000)]
Merge "Throttle jobs for idle apps"
Alex Klyubin [Fri, 3 Apr 2015 20:21:52 +0000 (20:21 +0000)]
am
e2e5b88e: am
64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."
* commit '
e2e5b88e3ad2d18cde31f55a750e76d3d1b25185':
Load fewer classes when AndroidKeyStore provider is installed.
Amith Yamasani [Wed, 4 Mar 2015 17:56:14 +0000 (09:56 -0800)]
Throttle jobs for idle apps
First pass at delaying jobs from apps that are idle.
TODO: Throttle syncs
TODO: Provide a periodic point at which apps are checked for idleness.
Apps that switch to foreground process state are tracked by UsageStats
as an INTERACTION event that affects the last-used timestamp.
JobScheduler's logic for when an app is ready is trumped by the idleness
of the app, and only if the battery is not charging. When charging state
changes, we update the idle state of all the tracked jobs.
android package is whitelisted.
Bug:
20066058
Change-Id: I0a0acb517b100a5c7b11e3f435f4141375f3451f
Elliott Hughes [Fri, 3 Apr 2015 20:16:21 +0000 (20:16 +0000)]
Merge "Only Windows doesn't have %zd."
Alex Klyubin [Fri, 3 Apr 2015 20:10:36 +0000 (20:10 +0000)]
am
64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."
* commit '
64b0062a373102f83837faade20b469685758139':
Load fewer classes when AndroidKeyStore provider is installed.
ztenghui [Fri, 3 Apr 2015 20:08:56 +0000 (20:08 +0000)]
Merge "Add group scaling factor into stroke width."
John Spurlock [Fri, 3 Apr 2015 20:07:54 +0000 (20:07 +0000)]
Merge "Zen: Changes to support new priority settings."
John Spurlock [Fri, 3 Apr 2015 20:07:31 +0000 (20:07 +0000)]
Merge "Volume: Port safety warning over to new dialog."
John Spurlock [Fri, 3 Apr 2015 19:10:31 +0000 (15:10 -0400)]
Zen: Changes to support new automation settings sub-section.
Bug:
20064962
Change-Id: I1da5bd1f8ef52a070b8225da4b761979f290df77
Chris Craik [Fri, 3 Apr 2015 16:37:49 +0000 (09:37 -0700)]
Delete pre-glop path
bug:
19014311
Change-Id: I06376b6f625455892d8eafe2727b78025a64c4bf
Alex Klyubin [Fri, 3 Apr 2015 20:01:09 +0000 (13:01 -0700)]
resolved conflicts for merge of
b068f162 to master
Change-Id: I5bc234e1da047880d3437a861ff93474a9797e18
Elliott Hughes [Fri, 3 Apr 2015 19:56:45 +0000 (12:56 -0700)]
Only Windows doesn't have %zd.
Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
Chad Brubaker [Fri, 3 Apr 2015 19:55:38 +0000 (19:55 +0000)]
am
54d583c1: am
e797eb2e: am
377885e1: Merge "Mark all test keys as no auth required"
* commit '
54d583c148fd14034afc751ad70ab772de55eb92':
Mark all test keys as no auth required
Alex Klyubin [Fri, 3 Apr 2015 19:55:22 +0000 (19:55 +0000)]
am
c869ac1b: am
ec029e55: am
b292e49b: Merge "Obtain SPI without using Reflection."
* commit '
c869ac1b7d163282ffdebf4ce9b32c479766f52d':
Obtain SPI without using Reflection.
John Spurlock [Fri, 3 Apr 2015 17:47:14 +0000 (13:47 -0400)]
Zen: Changes to support new priority settings.
Bug:
20064962
Change-Id: Iac3444c0a55830d5e5459e26c2172d974db600d6
Alex Klyubin [Fri, 3 Apr 2015 19:47:17 +0000 (19:47 +0000)]
Merge "Load fewer classes when AndroidKeyStore provider is installed."
Adam Lesinski [Fri, 3 Apr 2015 19:45:44 +0000 (19:45 +0000)]
Merge "AAPT2 statically link libz on Windows builds"
Alex Klyubin [Fri, 3 Apr 2015 19:32:39 +0000 (12:32 -0700)]
Load fewer classes when AndroidKeyStore provider is installed.
This avoids loading all AndroidKeyStore crypto SPI classes when the
AndroidKeyStore provider is instantiated and installed. This provider
is installed early on during the initialization of each app. Most apps
don't need these classes loaded.
Bug:
18088752
Change-Id: Ib43c9dd6a7d434b128916e0f9c8652ba61df0d47
Adam Lesinski [Fri, 3 Apr 2015 19:44:40 +0000 (12:44 -0700)]
AAPT2 statically link libz on Windows builds
Change-Id: I2abf47273173c470c04e00a54aa619fe1ce0e745
Alex Klyubin [Fri, 3 Apr 2015 19:43:43 +0000 (19:43 +0000)]
am
376b23e6: am
08963653: Merge "Rename KeymasterException to KeyStoreException."
* commit '
376b23e6fdda35cc6fa61ea9a3c10d109fe2d601':
Rename KeymasterException to KeyStoreException.
Chad Brubaker [Fri, 3 Apr 2015 19:43:38 +0000 (19:43 +0000)]
am
e797eb2e: am
377885e1: Merge "Mark all test keys as no auth required"
* commit '
e797eb2eea885f086465e47efc464adcd0d7acea':
Mark all test keys as no auth required
Alex Klyubin [Fri, 3 Apr 2015 19:43:33 +0000 (19:43 +0000)]
am
ec029e55: am
b292e49b: Merge "Obtain SPI without using Reflection."
* commit '
ec029e551641982294d9b346b741c84d2510d670':
Obtain SPI without using Reflection.
Adam Lesinski [Fri, 3 Apr 2015 19:33:52 +0000 (19:33 +0000)]
Merge "Fix windows build of AAPT2"
Fabrice Di Meglio [Fri, 3 Apr 2015 19:33:41 +0000 (19:33 +0000)]
Merge "Add private flag PRIVATE_FLAG_HAS_DOMAIN_URLS to ApplicationInfo"
Alex Klyubin [Fri, 3 Apr 2015 19:33:27 +0000 (19:33 +0000)]
am
08963653: Merge "Rename KeymasterException to KeyStoreException."
* commit '
08963653fc9434d2f50d3c8e64c757138efd102e':
Rename KeymasterException to KeyStoreException.
Chad Brubaker [Fri, 3 Apr 2015 19:33:21 +0000 (19:33 +0000)]
am
377885e1: Merge "Mark all test keys as no auth required"
* commit '
377885e1e6a4efc727060cca241fea29114315d5':
Mark all test keys as no auth required
Alex Klyubin [Fri, 3 Apr 2015 19:33:14 +0000 (19:33 +0000)]
am
b292e49b: Merge "Obtain SPI without using Reflection."
* commit '
b292e49b32fa321e59bf88c68e4c4d8c139645dd':
Obtain SPI without using Reflection.
Adam Lesinski [Fri, 3 Apr 2015 19:08:26 +0000 (12:08 -0700)]
Fix windows build of AAPT2
Change-Id: Ib8e1a4322510b582e9600a08d3118842c9abc73c
Fabrice Di Meglio [Wed, 1 Apr 2015 22:58:47 +0000 (15:58 -0700)]
Add private flag PRIVATE_FLAG_HAS_DOMAIN_URLS to ApplicationInfo
This is for supporting Settings UX and Domain URLs
- the new PRIVATE_FLAG_HAS_DOMAIN_URLS flag will be set by
generateApplicationInfo() when the Activity is said to have some
IntentFilter with a VIEW action and a http / https data URI
- code cleaning for args passing
- also add a new constant for the MetricsLogger
Change-Id: I5c9762fc2c4a9b46c0e255b9a23bffd70fae40c7
Alex Klyubin [Fri, 3 Apr 2015 19:13:49 +0000 (19:13 +0000)]
Merge "Rename KeymasterException to KeyStoreException."
Chad Brubaker [Fri, 3 Apr 2015 19:13:18 +0000 (19:13 +0000)]
Merge "Mark all test keys as no auth required"
Alex Klyubin [Fri, 3 Apr 2015 19:13:15 +0000 (19:13 +0000)]
Merge "Obtain SPI without using Reflection."
Alex Klyubin [Fri, 3 Apr 2015 19:12:16 +0000 (19:12 +0000)]
Merge "Add fingerprint-specific API to KeyPairGeneratorSpec."
Alex Klyubin [Fri, 3 Apr 2015 16:44:39 +0000 (09:44 -0700)]
Obtain SPI without using Reflection.
Bug:
18088752
Change-Id: I76d42e17f5f28af6fd9a96ee812d286f6c6a085b
Phil Burk [Fri, 3 Apr 2015 18:55:03 +0000 (18:55 +0000)]
Merge "audio: add AudioFormat.ENCODING_DTS"
Eino-Ville Talvala [Thu, 5 Mar 2015 23:42:49 +0000 (15:42 -0800)]
Camera2: Wire depth formats into StreamConfigurationMap
Change-Id: I9046b60dca83d090efd9c74c98bfdfebdeae8751
Jorim Jaggi [Fri, 3 Apr 2015 18:26:28 +0000 (18:26 +0000)]
Merge changes from topic 'assist'
* changes:
Add test assist to implement motion study
Implement new assist gesture and motion
Add flag to voice interactor for supporting assist gesture
Add more internal API's for assist
Add ability to start voice interaction session directly
Miao Wang [Fri, 3 Apr 2015 18:18:01 +0000 (18:18 +0000)]
am
1327fa9e: am
511eb660: am
6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."
* commit '
1327fa9eb155eb57fe24a8aa90a18f57d706e86b':
[RenderScript] update exception reporting for copyTo() after autoPadding added.