136495 Commits

Author SHA1 Message Date
George Mount
c84947db56 Merge changes I2da66b54,I8a65428d
* changes:
  Fix for quick "back" in Activity Transitions.
  Enter and exit transitions are inverted in calling Activity.
2014-05-21 13:51:44 +00:00
Adrian Roos
2fe592d49b Add trust indicator to keyguard
Changes the unlock icon to an open lock
when the keyguard will not ask for credentials.

Bug: 14295559
Change-Id: If34a5ec9e23b2d22813860faee125e6b2d700643
2014-05-21 15:51:14 +02:00
Adrian Roos
efb5d8d317 Merge "Add dumpsys facility and a history to TrustManagerService" 2014-05-21 13:44:07 +00:00
Yohei Yukawa
c834a2590c Update InputMethodSubtypeSwitchingController correctly
User visible behavior is supposed to be identical with and
without this CL.

Previously, there is some corner cases where
InputMethodSubtypeSwitchingController#resetCircularListLocked is
not called but the list of enabled input method is updated.

Fortunately, this corner cases are not observable for a user
because we have not updated the the rotation order dynamically.

However we should fix this before implementing smarter rotation
algorithm that changes the rotation order dynamically.

BUG: 7043015
Change-Id: I145a514dc4cde369ba50431c408c916046ab0c6e
2014-05-21 22:42:32 +09:00
Dan Sandler
b979f23c59 Elide extras strings from noman dumpsys output.
Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
2014-05-21 13:36:41 +00:00
The Android Automerger
d23d0b8ea4 merge in master-release history after reset to 1e0d82fdb15231d881d94c51f5eb1b30abd4b045 2014-05-21 05:50:19 -07:00
Chris Wren
5daa4598e2 Merge "add ranking information to the dumpsys info" 2014-05-21 12:36:06 +00:00
Jeff Brown
e665221764 am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-dev
* commit 'c28716964c4525bf9a291404d7f14e74de23f36f':
  Fix build.
2014-05-21 11:16:58 +00:00
Jeff Brown
4bfcae9a3f am 77669abb: am 9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
* commit '77669abb8300b672700418216939b9253dc98bee':
  Defer display ready until brightness ramp completes.
2014-05-21 11:16:52 +00:00
Narayan Kamath
d862ebb603 resolved conflicts for merge of fcc4fed3 to master
Change-Id: Icebca982b01debd67a1470c02651ef8936f6e5b0
2014-05-21 12:07:35 +01:00
Sander Alewijnse
9853e2a8b3 Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE." 2014-05-21 10:34:00 +00:00
Robin Lee
c8e4b8107a Merge "DPM: Disallow some DeviceAdmin policies for ProfileOwners" 2014-05-21 09:41:19 +00:00
Robin Lee
a9ee672953 DPM: Disallow some DeviceAdmin policies for ProfileOwners
A profile owner should only have control over the profile. All of the
following device admin APIs that affect the device beyond the profile
that they are called from are now disallowed:

 - Camera enable/disable
 - Keyguard
 - Wipe external storage

@bug 14434826

Change-Id: I69acfdf6f654f48b5db91aeb3ea86662d7857075
2014-05-21 09:40:19 +00:00
Jungshik Jang
358164c09e Add finish() after timeout of Reqeust Arc operations.
If <Request ARC Initiation> and <Request ARC Termination>
receive no <Initiate ARC> and <Termniate ARC> and
it should clean up itself, i.e call finish().

Change-Id: Id10fbe416cf5f5ab836935a1b560864b5cbd3b83
2014-05-21 18:25:47 +09:00
Sander Alewijnse
3856204c0e Merge "Disallow adb sideloading if UserManager flag is set for user." 2014-05-21 09:19:08 +00:00
Sander Alewijnse
1c91077bf7 Disallow adb sideloading if UserManager flag is set for user.
Solution is based on "redefining" the User_all.

Change-Id: Ie1ce5d6391e807f8caa05fe2a92009923d1032a8
2014-05-21 10:12:33 +01:00
Brian Carlstrom
c8c271c750 am 1d265716: am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '1d265716954122f79d5fdd9d953a98e303d298c9':
  Improve ABI handling for shared user ids.
2014-05-21 09:08:16 +00:00
Jeff Brown
c28716964c am 6099fd21: Merge "Fix build." into klp-modular-dev
* commit '6099fd21e190ffdf8e03ba6d96cce0d53c2765fd':
  Fix build.
2014-05-21 08:40:39 +00:00
Jeff Brown
77669abb83 am 9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
* commit '9beccf9f9e28f74bd78041e4381b59ce0a2351e7':
  Defer display ready until brightness ramp completes.
2014-05-21 08:40:36 +00:00
Jeff Brown
fcc4fed3c1 am 6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev
* commit '6fb904bfd1f943547d6e5bc6f199ffec2290da01':
  Make power button behavior configurable.
2014-05-21 08:40:33 +00:00
Brian Carlstrom
1d26571695 am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit 'e77a77d081ff9d05100702f5880f356da27fd087':
  Improve ABI handling for shared user ids.
2014-05-21 08:27:03 +00:00
Brian Carlstrom
e77a77d081 am ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit 'ec71fed089965c4d731eaa90344849a1775f937a':
  Improve ABI handling for shared user ids.
2014-05-21 06:46:26 +00:00
Jungshik Jang
e1a2e26a03 Merge "Add several actions for ARC (Audio Return Channel)" 2014-05-21 06:43:09 +00:00
Jungshik Jang
2f51aec689 Fix NullPointerException on init of HdmiMhlController.
Change-Id: I2f79ce0ef3a368c2fcc8d047de2dcad914679e0c
2014-05-21 06:42:07 +00:00
Brian Carlstrom
579eb67722 Merge "Improve ABI handling for shared user ids." 2014-05-21 06:24:15 +00:00
Brian Carlstrom
ec71fed089 Merge "Improve ABI handling for shared user ids." 2014-05-21 06:01:06 +00:00
Alan Viverette
0a2242b18f Quantum popup nine-patch with baked-in shadow
Also updates background color for Quantum dark so that the shadow
is visible against the background.

BUG: 15120387
Change-Id: I19bf176491b5f2b82f9a38afe9593cb6e5592623
2014-05-20 22:54:37 -07:00
Jungshik Jang
67ea521d14 Add several actions for ARC (Audio Return Channel)
ARC channel is established by both TV and AV Reciever.
From TV, it sends <Request ARC Initiation> and AVR
responds with <Initiate ARC>.
From AVR, it can be initiated by sending <Initiate ARC> directly
to TV.
Once TV receives <Initiate ARC> it sets up ARC internally
and replies <Report ARC Initiated> to AVR.
Termination steps are almost same except for message name
(use Terminate instread of Initiation).

In order to implement the above steps, this change introduces
following classes.

RequestArcInitiation(Termination)Action:
  handles <Request ARC Initiation> (<Request ARC Termination>)
  RequestArcAction handles common logic of them.

SetArcTransmissionStateAction:
  handles ARC set up, enabling/disabling ARC and
  reports results to AVR.

<Initiate ARC> and <Terminate ARC> handles directly in
HdmiControlService

Along with this, this change has implmentation for
add&removeAction. To avoid synchronization issue
they are isolated to main thread.

Change-Id: I3c5cf7c777e6c1de50d63ce4643b191dfe15fe1f
2014-05-21 14:52:50 +09:00
Vinit Deshpande
674ca8a1f4 Make Wifi WPS API available on application layer
Un-hide WPS methods (and required interface classes, etc.) of WifiManager to
enable Apps to start/stop the WPS procedure, add a patch for WPS method
KEYPAD to avoid early failure callbacks. (Methods PBC, DISPLAY, KEYPAD
tested on 4.4.2_r2.)

Change-Id: I25aafdc4b637c87d754d4fdb70e40a34a569b738
Signed-off-by: Olaf Stoyke <o.stoyke@avm.de>
2014-05-20 22:26:19 -07:00
Jeff Brown
6099fd21e1 Merge "Fix build." into klp-modular-dev 2014-05-21 05:17:31 +00:00
Jeff Brown
61116acdc6 Fix build.
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
2014-05-20 22:16:25 -07:00
Narayan Kamath
96db91e0ff Improve ABI handling for shared user ids.
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.

This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.

This also has the side effect of fixing 15081286.

bug: 15081286

(cherry-picked from commit b851c89d2252cf3d1dc504558ce1553527885316)

Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
2014-05-20 22:10:24 -07:00
Jeff Brown
9beccf9f9e Merge "Defer display ready until brightness ramp completes." into klp-modular-dev 2014-05-21 05:09:15 +00:00
Jeff Brown
4255869ac0 Defer display ready until brightness ramp completes.
Bug: 14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
2014-05-20 22:02:46 -07:00
Jason Sams
cd956e0fe2 Merge "Validate RenderScript context creation flags" 2014-05-21 04:50:24 +00:00
Jeff Brown
6fb904bfd1 Merge "Make power button behavior configurable." into klp-modular-dev 2014-05-21 04:28:34 +00:00
Jeff Brown
6d8fd27e51 Make power button behavior configurable.
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.

Bug: 14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
2014-05-20 21:24:38 -07:00
Yuhao Zheng
26611efc2a Merge "Hotspot 2.0 framework - add implementation" 2014-05-21 04:21:23 +00:00
Wei Wang
ab39cb7f6a Add scan response as an advertising parameter(1/2).
Change-Id: I75c500dd7b5f2609d3092f50ba284a5ec4a41987
2014-05-20 20:38:29 -07:00
Griff Hazen
3d6eed9613 am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit '08a8c2ca45dc859e79d54990d2ae0392d475aeda':
  Fixes to WearableActionExtensions
2014-05-21 02:48:24 +00:00
Griff Hazen
08a8c2ca45 am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit 'ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
  Fixes to WearableActionExtensions
2014-05-21 02:44:16 +00:00
Jeff Brown
7a32533c62 am ccf51bef: am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit 'ccf51bef288652cb618a566a376173e252b84af0':
  I'm feeling the good vibrations.
2014-05-21 02:41:06 +00:00
Griff Hazen
ef6aae62f6 Merge "Fixes to WearableActionExtensions" into klp-modular-dev 2014-05-21 02:41:02 +00:00
Jeff Brown
df3bad37d2 am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '8f120dd6d631ac632d3356b81403a53f958021f0':
  Allow display timeouts to be set in config.xml.
2014-05-21 02:41:00 +00:00
Jeff Brown
ccf51bef28 am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit '2d9b513dab78242281bca125b4abc6b8235089a6':
  I'm feeling the good vibrations.
2014-05-21 02:38:11 +00:00
Jeff Brown
8f120dd6d6 am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
  Allow display timeouts to be set in config.xml.
2014-05-21 02:38:07 +00:00
Jeff Brown
2d9b513dab Merge "I'm feeling the good vibrations." into klp-modular-dev 2014-05-21 02:35:09 +00:00
Dirk Dougherty
42bff1ce2e am 3dc330af: am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines.
* commit '3dc330af6b590ebd3c6529e8b123f51cebb134e2':
  Remove monetization image in edu guidelines.
2014-05-21 02:34:43 +00:00
Jeff Brown
0702786d81 Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev 2014-05-21 02:34:25 +00:00
Jeff Brown
969579bb9d I'm feeling the good vibrations.
When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution.  However if
the system is performing haptic feedback then we want to allow
it to run to completion.

Bug: 14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
2014-05-20 19:29:29 -07:00