Commit Graph

53627 Commits

Author SHA1 Message Date
Jeff Brown
8bdd92d44e am 0cb1cfdc: am 76c4c666: Add USB port manager.
* commit '0cb1cfdcc306f78030403c8da22bfcda630c5527':
  Add USB port manager.
2015-07-15 22:45:03 +00:00
Jeff Brown
0cb1cfdcc3 am 76c4c666: Add USB port manager.
* commit '76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
  Add USB port manager.
2015-07-15 22:26:38 +00:00
Jim Miller
204c2de8bb am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
* commit 'c7b0435cc709c328da8e2b515ea04c8bc40d1094':
  Improve tracking of screen on reasons.
2015-07-15 21:59:27 +00:00
Jim Miller
c7b0435cc7 resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
2015-07-15 14:33:10 -07:00
Anthony Hugh
26fa501dd6 DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
2015-07-15 13:34:25 -07:00
Jeff Brown
76c4c6668a Add USB port manager.
Add some new internal APIs to enumerate USB Type C ports, query their
status, determine whether they support changing power or data roles,
and doing so.  The API also adds a new ACTION_USB_PORT_CHANGED broadcast
for port state changes.

The implementation includes a mechanism for simulating the behavior
of the USB stack.  See 'adb shell dumpsys usb -h' for details.

Note that the underlying kernel driver interface is still subject
to change but its behavior has been encapsulated as much as possible.

Bug: 21615151
Change-Id: I0c853ae179248a4550b3e60d02a7a7e65e4546b2
2015-07-15 11:34:29 -07:00
Dianne Hackborn
1d4247c4cc Merge "Improve tracking of screen on reasons." into mnc-dev 2015-07-15 17:11:12 +00:00
Dianne Hackborn
280a64e793 Improve tracking of screen on reasons.
- New screen on app op to record the last time each app has
  caused the screen to be turned on.
- New battery stats event that tells us the reason the screen
  has been asked to turn on.
- Propagate out power manager API to specify the reason a caller
  is asking to have the screen turned on.

Note that currently the window flag to turn the screen on bypasses
much of this because it is being handled in the window manager by
just directly telling the power manager to turn the screen on.  To
make this better we need a new API where it can specify who it is
calling the API for.

Change-Id: I667e56cb1f80508d054da004db667efbcc22e971
2015-07-15 09:59:07 -07:00
George Mount
b72c15794e am 91202e59: am 503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '91202e5929dbaf5013dd0e641e4c9e98d9d3f256':
  Fix input pause without resume.
2015-07-15 14:40:18 +00:00
George Mount
91202e5929 am 503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '503ad9ee0d701d045c382cd534865f48f69c024b':
  Fix input pause without resume.
2015-07-15 14:24:18 +00:00
George Mount
503ad9ee0d Merge "Fix input pause without resume." into mnc-dev 2015-07-15 14:12:28 +00:00
Adam Powell
19dd44c222 am 5e078458: am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
* commit '5e078458c2a0d21aae6aa28530aee665fe065906':
  Relax strict ActionMode instance checking when finishing action modes
2015-07-15 02:55:35 +00:00
Adam Powell
5e078458c2 am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
* commit '18709f9a0095afe6dba11f9dd71e3210c5f4e1db':
  Relax strict ActionMode instance checking when finishing action modes
2015-07-15 02:43:10 +00:00
Adam Powell
18709f9a00 Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev 2015-07-15 02:31:21 +00:00
Dianne Hackborn
4f73990a51 am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev
* commit 'aa3694f2b3396f0ea9c9cccb7dbe8d5664e1e691':
  Fix issue #21626564: MMS should be receivied while Dozing
2015-07-15 02:08:55 +00:00
Adam Powell
c3cb6c9b22 Relax strict ActionMode instance checking when finishing action modes
In previous platform versions, finishing an action mode would clean up
the current action mode even if it was not the same ActionMode
instance. Some common shared code inadvertently relied on this
behavior, so stay bug-compatible with it based on targetSdkVersion.
New apps will get the stricter behavior.

Bug 22265882

Change-Id: Id5d6341aefc07a3cb788d5d6d0b531816f761e42
2015-07-14 19:08:39 -07:00
Fyodor Kupolov
d39b3d2d51 am 0e45f873: am 4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
* commit '0e45f8737a2a14064301dacdd33d3e03adc6f273':
  Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
2015-07-15 01:58:02 +00:00
Dianne Hackborn
aa3694f2b3 am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev
* commit 'f1f8b9cc3ff5774e695568e8f02b018c0fd02844':
  Fix issue #21626564: MMS should be receivied while Dozing
2015-07-15 01:57:21 +00:00
Dianne Hackborn
f1f8b9cc3f Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev 2015-07-15 01:45:44 +00:00
Fyodor Kupolov
0e45f8737a am 4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
* commit '4044440d2c1a9d185a3379b88d88c96f8e234887':
  Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
2015-07-15 01:43:02 +00:00
Fyodor Kupolov
4044440d2c Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev 2015-07-15 01:34:43 +00:00
Dianne Hackborn
fd854ee58c Fix issue #21626564: MMS should be receivied while Dozing
We now place whoever is receiving the MMS on the temporary
whitelist while doing so, so they can get network access to
download it.

There was also an issue that needed to be fixed where we
were no longer updating the list of allowed uids while
dozing based on their proc states...  we now do that.

Also did a bit of optimization of the temp white list update
path do the network policy manager, instead of going through
a broadcast we now directly call in to the network policy
manager.  This also allows us to have a synchronous version
of updating the list, so we can know the app has network access
before we tell it to do anything.

Finally added battery stats events for things going on and off
the whitelist so we can diagnose the behavior there.

Change-Id: Ic7fe010af680034d9f8cb014bb135b2addef7455
2015-07-14 18:33:08 -07:00
Fyodor Kupolov
41fac5e890 am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '189f3136610809ea284d895be0e04bb87561370d':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:14:20 +00:00
Fyodor Kupolov
189f313661 am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '987241265b77542f45ce95838c25beeaf3ae6849':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:00:44 +00:00
Adam Lesinski
f96a33865b am e5c0550d: am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
* commit 'e5c0550dfe4089e10148a5208cd18a0eadbe8bbe':
  BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
2015-07-15 00:53:01 +00:00
Fyodor Kupolov
987241265b Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev 2015-07-15 00:48:40 +00:00
Adam Lesinski
e5c0550dfe am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
* commit '267240f2ddbaa0ea2828d7466f310c6ffc7c91cd':
  BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
2015-07-15 00:39:13 +00:00
Adam Lesinski
267240f2dd Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev 2015-07-15 00:30:20 +00:00
Fyodor Kupolov
d4fd8c766d Added sendBroadcastMultiplePermissions method
Added Context.sendBroadcastMultiplePermissions(Intent intent, String[]
receiverPermissions) method, which allows an array of required permissions
to be enforced.

Bug: 21852542
Change-Id: I27c9130e8f004b428452501ebc8a36aabde1f343
2015-07-14 17:25:42 -07:00
Adam Lesinski
bdb0273455 BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
Bug:22461683
Change-Id: Iffb847268d2872bd2a843e28dc41fa22b1e36828
2015-07-14 16:51:53 -07:00
Adam Lesinski
b3b21b46a9 am d4d190ca: am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
* commit 'd4d190caed257afec060fe9d654059703a923d97':
  BatteryStats: Fix units in wakelock distribution calculation
2015-07-14 23:26:27 +00:00
Yin-Chia Yeh
3bb64f2dfa am 9d513cec: am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
* commit '9d513cec7c9721974d782471931d302281d3e898':
  Camera: clarify largest JPEG dimension expectation
2015-07-14 23:26:22 +00:00
Fyodor Kupolov
1aeceef44d am fc4acfd9: am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
* commit 'fc4acfd93c57277cb90774461e475a5032404d36':
  Revert "Allow array of required permissions in sendBroadcast"
2015-07-14 23:26:18 +00:00
Adam Lesinski
d4d190caed am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
* commit 'd4c1861a536d022b00505c75c30529c50688f26a':
  BatteryStats: Fix units in wakelock distribution calculation
2015-07-14 23:13:43 +00:00
Yin-Chia Yeh
9d513cec7c am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
* commit 'b42cb352a350bac198470f65125aa151ecacff13':
  Camera: clarify largest JPEG dimension expectation
2015-07-14 23:13:27 +00:00
Fyodor Kupolov
fc4acfd93c am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
* commit '4a817924ecb282eef48b06b92f8e1914edd6cec2':
  Revert "Allow array of required permissions in sendBroadcast"
2015-07-14 23:13:22 +00:00
Adam Lesinski
d4c1861a53 Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev 2015-07-14 23:00:24 +00:00
Yin-Chia Yeh
b42cb352a3 Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev 2015-07-14 22:53:11 +00:00
Fyodor Kupolov
4a817924ec Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev 2015-07-14 22:43:47 +00:00
Fyodor Kupolov
e37520b49d Revert "Allow array of required permissions in sendBroadcast"
This reverts commit b4e7283c9a.

Change-Id: Ie8390964bda5bdfa869cee8f46584043d8e7c664
2015-07-14 22:29:21 +00:00
Fyodor Kupolov
7017479423 am ef77c116: am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
* commit 'ef77c116f3c1272f623627aec997c10c1432b03c':
  Allow array of required permissions in sendBroadcast
2015-07-14 22:27:47 +00:00
Fyodor Kupolov
ef77c116f3 am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
* commit 'd69a82c107cea4aca87eecc3978e21ea9bc23c82':
  Allow array of required permissions in sendBroadcast
2015-07-14 22:12:00 +00:00
Fyodor Kupolov
d69a82c107 Merge "Allow array of required permissions in sendBroadcast" into mnc-dev 2015-07-14 21:57:34 +00:00
Jeff Sharkey
556136c8b6 am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev
* commit 'c7a607496aa5ba368524dd334877a9c428ab5f78':
  Better handling of storage paths.
2015-07-14 21:28:27 +00:00
Chien-Yu Chen
8f2ea4ccc5 am 951e2633: am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev
* commit '951e2633ebe5338a764bb8084c0c6f1166ace260':
  Camera: Reconnect after camera service crashes
2015-07-14 21:28:23 +00:00
Jorim Jaggi
07e3cbc3ad am 4cfdcf5b: Touch, wake and unlock
* commit '4cfdcf5b0551e5656ea379c428e78b812c2e5cbe':
  Touch, wake and unlock
2015-07-14 21:28:16 +00:00
Jeff Sharkey
c7a607496a am d3719ab0: Merge "Better handling of storage paths." into mnc-dev
* commit 'd3719ab07a0ba66c019979ce19c45b77c4aae92e':
  Better handling of storage paths.
2015-07-14 21:18:26 +00:00
Chien-Yu Chen
951e2633eb am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev
* commit '6eec00ecf456b8a24487828b6f515cccc465cc1a':
  Camera: Reconnect after camera service crashes
2015-07-14 21:18:22 +00:00
Jorim Jaggi
4cfdcf5b05 Touch, wake and unlock
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I0c43bcc9d334b509632704fb0c123ab3351edff2
2015-07-14 21:05:26 +00:00
Jeff Sharkey
d3719ab07a Merge "Better handling of storage paths." into mnc-dev 2015-07-14 20:53:16 +00:00