186481 Commits

Author SHA1 Message Date
Jinsuk Kim
c45fd20f55 Merge "CEC: Do not send <ARC Terminated> when init request gets rejected" 2015-03-30 05:07:17 +00:00
Jinsuk Kim
c6563961e5 CEC: API setSystemAudioMode
This CL adds a system API to set system audio mode. Previously
not available to have the settings app use aidl directly. Now
added since other related APIs like setSystemAudioVolume are
already in.

Change-Id: I51f4f992f66f97a094cad5788548c259ac8bf10f
2015-03-30 09:43:05 +09:00
Mathieu Chartier
f37c099c70 am 2169c68a: am d9dddea5: am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '2169c68aa330670ab340ec7faaedb5e5a9a59360':
  Change getDeclaredFieldsUnchecked call to new return value
2015-03-30 00:36:51 +00:00
Mathieu Chartier
2169c68aa3 am d9dddea5: am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit 'd9dddea504d717120eaa5e9c15fe484e26511e92':
  Change getDeclaredFieldsUnchecked call to new return value
2015-03-30 00:26:46 +00:00
Craig Mautner
8501866d74 Merge "Still more debugging for bug 19823482" 2015-03-29 23:50:00 +00:00
Mathieu Chartier
d9dddea504 am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"
* commit '631565abd6cadd65befe197afa7bac0d44f70fb2':
  Change getDeclaredFieldsUnchecked call to new return value
2015-03-29 22:42:53 +00:00
Jinsuk Kim
71651d3712 CEC: Do not send <ARC Terminated> when init request gets rejected
System audio may reject <Request ARC Initiation> with a response
<Feature Abort> or just time out. Do not send <Request ARC Terminated>
in response so as not to turn off the ARC mode, as it may not be
the intended behavior.

Bug: 19928094

Change-Id: I469dfa53bf35dfbca7daa86a69763b10551663ec
2015-03-30 07:31:10 +09:00
Mathieu Chartier
631565abd6 Merge "Change getDeclaredFieldsUnchecked call to new return value" 2015-03-29 22:30:41 +00:00
Wale Ogunwale
ebf750bc9b Merge "Fixed issue with paused activity still freezing display." 2015-03-29 19:21:50 +00:00
Wale Ogunwale
07927bffa7 Fixed issue with paused activity still freezing display.
An activity freezes the display when it is relaunched when
configuration changes. If the activity takes time to launch and
another activity is launched before it is done, the activity that
froze the display will be paused and might not have the chance to
unfreeze the display. This will put WindowManager in an odd state.
We now unfreeze the display when an activity is done pausing in case
it was previously freezing the display.

Bug: 19823482
Change-Id: If5538aea639e06d0b8621646bf6b2e12d325287a
2015-03-29 09:55:21 -07:00
Craig Mautner
7258118c06 Still more debugging for bug 19823482
Change-Id: I2a9270ebd0a31c9dc62732b67c640191549d396e
2015-03-29 09:43:22 -07:00
Svet Ganov
fc2d615a7b Fix build
Change-Id: Ib3fc843ad02ea3a83f03cf1d6b063d4031da51b1
2015-03-28 21:08:44 -07:00
Svet Ganov
4bc3d5c4cd Merge "Fix runtime permissinos toggling and relax XML parsing." 2015-03-29 03:16:27 +00:00
Svet Ganov
12a692a5e8 Fix runtime permissinos toggling and relax XML parsing.
1. Fixed the case where runtime permissons can be toggled by a
   developer via a system property.

2. Relaxed the runtime permission XML parsing to be more fault
   toelrant and consistent wiht the reset of the package manager
   parse code.

3. Fixed a deadlock due to calling in to the activity manager
   with the package manager lock held to kill an app.

Change-Id: I11dfb57ad4d8119baea79227dc2a3fe5e2208515
2015-03-28 20:14:58 -07:00
Tenghui Zhu
0783ba669c Merge "Revert "Use AVD for checkbox animation."" 2015-03-29 00:01:27 +00:00
Tenghui Zhu
c243221435 Revert "Use AVD for checkbox animation."
This reverts commit 9734bdc97ee3049cdadfb04fce1fd76626934519.

Change-Id: I2736560a7712418b7b69507a82619b9ca8552014
2015-03-28 23:27:12 +00:00
Svet Ganov
0cd50c518b Merge "Fix a regression in settings parsing" 2015-03-28 20:23:12 +00:00
Svet Ganov
c9755bc4f2 Fix a regression in settings parsing
Change-Id: I222bac482a843112ae031b00c83e3765ea6b456c
2015-03-28 13:21:22 -07:00
Mike Lockwood
549a8cb66d Merge "Make the MIDI Manager optional, enabled by "android.software.midi" feature" 2015-03-28 16:00:21 +00:00
Andreas Gampe
822b403b68 am 3fa46a0f: am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '3fa46a0f79f35ca32ce102d4bbb1138c517ee754':
  Frameworks/base: Change String == to equals in Preference
2015-03-28 05:18:14 +00:00
Andreas Gampe
2d3455993e am 1bca3532: am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '1bca3532687675d81dea805b12577a6c3a00b4c3':
  Frameworks/base: Fix request removal in VoiceInteractionSession
2015-03-28 05:18:03 +00:00
Andreas Gampe
3fa46a0f79 am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit 'd7fb6d26d809775996f70e23213392a3dcf10c8f':
  Frameworks/base: Change String == to equals in Preference
2015-03-28 05:11:07 +00:00
Andreas Gampe
1bca353268 am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '0e6b4da5ca53d338f351827f7a351edcd6281aaa':
  Frameworks/base: Fix request removal in VoiceInteractionSession
2015-03-28 05:11:02 +00:00
Andreas Gampe
d7fb6d26d8 am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit 'a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
  Frameworks/base: Change String == to equals in Preference
2015-03-28 05:03:25 +00:00
Andreas Gampe
0e6b4da5ca am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"
* commit '5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
  Frameworks/base: Fix request removal in VoiceInteractionSession
2015-03-28 05:03:18 +00:00
Andreas Gampe
a01250c774 Merge "Frameworks/base: Change String == to equals in Preference" 2015-03-28 04:50:44 +00:00
Andreas Gampe
5a15bf69d8 Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 2015-03-28 04:50:08 +00:00
Mathieu Chartier
3d529c5b0a Change getDeclaredFieldsUnchecked call to new return value
Required for related libcore change.

Bug: 19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
2015-03-27 18:55:50 -07:00
Christopher Tate
c5071f9bf1 Merge "Respect the transport's requestFullBackupTime() backoff" 2015-03-28 01:47:53 +00:00
Svet Ganov
a6439218d6 Merge "Relax the parsing code in settings provider." 2015-03-28 00:59:36 +00:00
Svet Ganov
8440ca3934 Relax the parsing code in settings provider.
The practice in the system server is to have lenient parsing code
to avoid the whole system being unusable due to a single XML error.

Change-Id: Idf44031edf5221966f3352ca2f83e284973ab95f
2015-03-27 17:58:40 -07:00
Christopher Tate
a7f038c9c3 Respect the transport's requestFullBackupTime() backoff
We now make sure to pause by at least requestFullBackupTime() between full-data
backup operations, to give the transport the ability to apply traffic control
while we're running the queue of eligible packages.

Also, we now reset a package's queue position whenever a full-data backup for
that package is run explicitly via adb.

Bug 19732890

Change-Id: I6cf24495ad18eebd55557f229d11c703e5b7f529
2015-03-27 17:58:18 -07:00
Makoto Onuki
75a0882b94 Enterprise quick contact 1/2
Now openQuickContact goes thorough DPM.  When a lookup URI is build with
a lookup key returned by the enterprise lookup APIs for a corp contact, the
lookup key will have a special prefix.  In that case we go through DPM
and have it launch QC on the managed profile, if the policy allows.

For now we use the same DPM policy as enterprise-caller-id to disable this.

Design doc: go/cp2-mnc-enterprise-dd

Bug 19546108

Change-Id: I4840e7fad8a6a60249df07d993d26d03619650d4
2015-03-27 17:19:01 -07:00
Geoff Mendal
f915585227 Merge "Import translations. DO NOT MERGE" 2015-03-28 00:12:57 +00:00
Geoff Mendal
39c78602fb Merge "Import translations. DO NOT MERGE" 2015-03-28 00:12:37 +00:00
Geoff Mendal
897c65dbf8 Merge "Import translations. DO NOT MERGE" 2015-03-28 00:12:14 +00:00
Christopher Tate
6e6af0d34e Merge "Add payload-size preflight stage to full transport backup" 2015-03-27 23:50:58 +00:00
Alex Klyubin
7760820ecc am 23c2b8e8: am d7e06104: am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '23c2b8e81ec5a6e0c344f09e728d87300ac29bc2':
  Symmetric key generation for AndroidKeyStore.
2015-03-27 23:49:25 +00:00
Chad Brubaker
2fb1d0eb20 am db22c659: am 3e89fac5: am dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit 'db22c6595c1b1949ff5473517609a7315b8e130f':
  Allow entropy to be provided to some operations
2015-03-27 23:49:17 +00:00
Bart Sears
e7e8761a51 am 8045a23a: am c27d3c2b: am c03cfc9d: am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '8045a23a08898abadcd3e3d355d65d757480e1e6':
  CEC: Explicitly turn on screen for remote control passthrough
2015-03-27 23:43:31 +00:00
Geoff Mendal
98a9c544a4 Import translations. DO NOT MERGE
Change-Id: Iae448041b1480ae3582be4c0b07dc4e4b1688e25
Auto-generated-cl: translation import
2015-03-27 16:40:35 -07:00
Alex Klyubin
23c2b8e81e am d7e06104: am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit 'd7e0610477b1a97ce6b566a19e1fe9246bc30f52':
  Symmetric key generation for AndroidKeyStore.
2015-03-27 23:37:49 +00:00
Chad Brubaker
db22c6595c am 3e89fac5: am dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit '3e89fac56966fc30790430f128887a987fea63d8':
  Allow entropy to be provided to some operations
2015-03-27 23:37:44 +00:00
Geoff Mendal
cbda5a02b1 Import translations. DO NOT MERGE
Change-Id: Iedf7a61cde1c2eed81a716c76afeaaf1388794e2
Auto-generated-cl: translation import
2015-03-27 16:37:11 -07:00
Alex Klyubin
2f0a46cf4f am 8e7df37c: am d880dc2f: am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '8e7df37c9af178cd443c487f258773c0017501aa':
  Symmetric key import for AndroidKeyStore.
2015-03-27 23:31:38 +00:00
Adam Metcalf
42e9344d51 Merge "Add support for GmsCore to apilint.py" 2015-03-27 23:26:31 +00:00
Alex Klyubin
d7e0610477 am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore."
* commit '36ee836d2f6e6df59d6a20a69421639bacf25559':
  Symmetric key generation for AndroidKeyStore.
2015-03-27 23:26:08 +00:00
Chad Brubaker
3e89fac569 am dbd9a4b6: Merge "Allow entropy to be provided to some operations"
* commit 'dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
  Allow entropy to be provided to some operations
2015-03-27 23:25:59 +00:00
Bart Sears
8045a23a08 am c27d3c2b: am c03cfc9d: am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit 'c27d3c2bd440a69d22bec8dd2c7bfe511fa53eba':
  CEC: Explicitly turn on screen for remote control passthrough
2015-03-27 23:24:11 +00:00
Geoff Mendal
6af24b1652 Import translations. DO NOT MERGE
Change-Id: Ie3cde38ec6847cf49d6ce2ed9b21b23f27ef5d63
Auto-generated-cl: translation import
2015-03-27 16:23:30 -07:00