17331 Commits

Author SHA1 Message Date
Dianne Hackborn
2932513181 (DO NOT MERGE) Battery monitoring fixes:
- Improve monitoring of level changes to not be confused
  when it goes up while draining or down while charging.
- Put back in connectivity service code to tell battery
  stats about the interfaces.
- Turn back on reporting of mobile radio active state
  from the RIL.
- Fix bug in marshalling/unmarshalling that would cause
  the UI to show bad data.

Change-Id: I733ef52702894cca81a0813eccdfc1023e546fce
2014-05-22 16:43:17 -07:00
Yohei Yukawa
4fae8e165b Merge "Remove unnecessary internal lock" 2014-05-22 11:07:14 +00:00
Yohei Yukawa
5a647b69be Remove unnecessary internal lock
Previously, InputMethodSubtypeSwitchingController has relied on
its own internal lock for #getNextInputMethod and
class has to be invalidated whenever
InputMethodManagerService#mMethodMap is updated, any method of
InputMethodSubtypeSwitchingController should be called under
the global lock of InputMethodManagerService#mMethodMap.

As a consequence, we can conclude that
InputMethodSubtypeSwitchingController does not need its own
internal lock.

This CL also adds additional synchronization blocks into
the constructor of InputMethodManagerService to address the
existing inconsistency that methods with *Locked suffix are
called without the lock actually.

BUG: 7043015
Change-Id: I9d4d3d7232c984432185c10c13fb726a6158cac8
2014-05-22 18:18:02 +09:00
Lorenzo Colitti
521d8cdae0 Merge "Make the EthernetManager available." 2014-05-22 05:55:56 +00:00
Jinsuk Kim
dbbceffd9b Merge "Add feature actions for HDMI-CEC playback device" 2014-05-22 03:19:23 +00:00
Jungshik Jang
0ddf4db856 Merge "Add finish() after timeout of Reqeust Arc operations." 2014-05-22 02:42:19 +00:00
Jinsuk Kim
78d695d8ba Add feature actions for HDMI-CEC playback device
- OneTouchPlayAction
- DevicePowerStatusAction
- addHotplugEventListener
- removeHotplugEventListener

Change-Id: Ia7f31507ca62127efbacbbfe07ab43ba1f9bd4cf
2014-05-22 11:15:51 +09:00
Lorenzo Colitti
f1cc12950c Merge "Delete the EthernetDataTracker." 2014-05-22 01:01:50 +00:00
Lorenzo Colitti
5569ba20b6 Merge "Fix a typo in IpConfigStore." 2014-05-21 23:53:47 +00:00
Lorenzo Colitti
f9ff2c9ae5 Make the EthernetManager available.
Change-Id: I7a60e977d7a40a5d0367168f2f6633ccae591ac4
2014-05-21 16:41:24 -07:00
Lorenzo Colitti
3c44c99af5 Delete the EthernetDataTracker.
Code search says these are the only two files that use it. The
tracker will be resurrected in a slightly different form in
frameworks/opt/net/ethernet.

Bug: 14993642
Bug: 14981801
Change-Id: I2477668ca78dfe46661dda1d97c7f786fd7eba35
2014-05-21 16:40:46 -07:00
Lorenzo Colitti
56cf7c517e Fix a typo in IpConfigStore.
Change-Id: I1fc845bf4547ae9a86db02ed29b6d5ba60a01277
2014-05-21 16:38:11 -07:00
Winson Chung
7220faeec6 Merge "Small perf tweaks." 2014-05-21 23:12:32 +00:00
Winson Chung
47a3e65acc Small perf tweaks. 2014-05-21 16:03:42 -07:00
Svetoslav
f34771187b Merge "Fixing bugs due to the new custom accessibility action APIs." 2014-05-21 21:59:19 +00:00
Svetoslav
5c4cd189f2 Fixing bugs due to the new custom accessibility action APIs.
1. AccessibiltiyAction was incorectly throwing an exception when
   a custom action was constructed.

2. AccessibilityManagerService should no longer enforce only standard
   actions as we allow custom ones too.

bug:15110963

Change-Id: Iea57e0a6449b87bd8d103c55ca255e80705f2565
2014-05-21 14:53:25 -07:00
Jason Monk
711b7a5428 Merge "Don't exit lock task on sleep" 2014-05-21 20:58:48 +00:00
narayan
a562f5daf6 am 82ec8c58: am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '82ec8c58b1f1cd0cce56d11b7679440f6ba54f4a':
  Fix NPE in PackageManagerService.
2014-05-21 20:49:09 +00:00
narayan
82ec8c58b1 am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit 'ab3d85ab1a0ae58add5df6efc30607624475405b':
  Fix NPE in PackageManagerService.
2014-05-21 20:22:03 +00:00
narayan
ab3d85ab1a am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '838b1e2215cbc27e77530f4c79124c088353e0e7':
  Fix NPE in PackageManagerService.
2014-05-21 20:17:52 +00:00
Jason Monk
2d437d0461 Don't exit lock task on sleep
Change-Id: I332088ce31ce06a771461a78fcc63f4afc824813
2014-05-21 16:06:53 -04:00
Christoph Studer
cee44ba418 Simplify NotificationListenerService API
Use ParceledListSlice to send the list of active notifications
from NoMan to NotificationListeners.

This allows us to simplify the API to what it was before
introducing the "String[] key" workaround for dealing with large
numbers of StatusBarNotifications.

While we're at it, rename Ranking.getIndexOfKey to something that
makes more sense.

Bug: 15126927
Change-Id: I02c2087978c6c4ec1198be496c6250a66143ecb3
2014-05-21 22:03:45 +02:00
narayan
0cfe875ac5 Fix NPE in PackageManagerService.
Check that each package from the setting has
a parsed pkg before we attempt to perform dex-opt
on it. If it doesn't have a parsed package, adjust
the ABI in the settings, but don't perform dexopt.
It will be dexopted later if it's still active
based on the setting.

bug: 15081286

Change-Id: Ifb6d1d5efdc9c59b251731972afa951ad930d05c
2014-05-21 21:00:48 +01:00
RoboErik
5b53148a4e Merge changes I1cbdff1d,I23906b4c
* changes:
  Handle headsethook voice launching
  Add 5s timeout to wakelock
2014-05-21 19:59:11 +00:00
justinzhang
7bd35c7e6f Use DeviecPolicyManager to authenticate lock task
Uncomment lines in ActivityManagerService. Before start lock task,
ActivityMangerService calls DevicePolicyManager to see if the
app can go into lock task.

Change-Id: I9ad784d7cc637d45884dcb2623b4c59ff802f93d
2014-05-21 15:28:08 -04:00
Dan Sandler
d0ec843882 am 7509733c: Elide extras strings from noman dumpsys output.
* commit '7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
  Elide extras strings from noman dumpsys output.
2014-05-21 16:26:29 +00:00
Dan Sandler
7509733c8d Elide extras strings from noman dumpsys output.
Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit 44de3cfc08428378b93172a2b03f9785a3638678)
2014-05-21 15:57:10 +00:00
Robin Lee
a9e460aefc Remove enforceManagedProfile for listing keyguard features
Change-Id: Ic89f09ada046f64b089b977868b6f37bc0a6de91
2014-05-21 15:19:40 +01:00
Yohei Yukawa
eac222a002 Merge "Update InputMethodSubtypeSwitchingController correctly" 2014-05-21 14:03:34 +00: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
Chris Wren
5daa4598e2 Merge "add ranking information to the dumpsys info" 2014-05-21 12:36:06 +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
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
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
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
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
4255869ac0 Defer display ready until brightness ramp completes.
Bug: 14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
2014-05-20 22:02:46 -07: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