Commit Graph

27539 Commits

Author SHA1 Message Date
Jim Miller
db19e1ded0 Merge "Fix the build" into mnc-dr-dev 2015-07-15 23:32:39 +00:00
Jim Miller
de5b573e2a Fix the build
Build broken due to a bad merge.

Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544
2015-07-15 16:29:30 -07:00
Christopher Tate
b6b97e90cb am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit '06476508c4aae6b9bb5affdc7470abf159ef9eda':
  Resolve based on the correct user's default browser
2015-07-15 23:12:59 +00:00
Christopher Tate
06476508c4 Merge "Resolve based on the correct user's default browser" into mnc-dev 2015-07-15 22:57:53 +00:00
Svet Ganov
12b05ec2e7 am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '75f6b94a5d5cadb218725011729466e8e438b231':
  Grant default permissions to the setup app robustly.
2015-07-15 22:28:10 +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
Jeff Brown
b3c1180538 am 2dbccc19: Clean up USB Manager dump.
* commit '2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
  Clean up USB Manager dump.
2015-07-15 22:26:34 +00:00
Svet Ganov
75f6b94a5d Merge "Grant default permissions to the setup app robustly." into mnc-dev 2015-07-15 21:58:50 +00:00
Christopher Tate
7991f7813e Resolve based on the correct user's default browser
Bug 22509659

Change-Id: Iac75e7b40609bf2c81d266e0568fbfbeb71bb3aa
2015-07-15 14:52:29 -07:00
Svet Ganov
50a8bf4da0 Grant default permissions to the setup app robustly.
There is a zoo of components that handle the home intent and
have different priority. There is no reliable way to distinguish
the setup app from the other apps that handle home as some of
them have lower priority than the setup app and some higher.
This change adds a dedicated category to recognize the default
setup app.

Uncommented the code that grants accounts permissions as the
get_accounts permission is now a runtime permission and can be
granted.

bug:22471024
bug:22501463

Change-Id: I41726751fa2567cbcd7d09c7acfa7615b8aba577
2015-07-15 14:46:23 -07: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
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
Jeff Brown
2dbccc1926 Clean up USB Manager dump.
Tidy up the dump() implementation in preparation for further work.

Bug: 21615151
Change-Id: If6d94c8dc9457b8e93103541ec1798981eeb5b54
2015-07-15 11:34:29 -07: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
Dianne Hackborn
aa7b14501a am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit '63461e61b9aba2514fb39f87b8741b6db1f7e5d7':
  Bump mms whitelist time up to 1 minute.
2015-07-15 01:57:25 +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
0b6134b511 Bump mms whitelist time up to 1 minute.
Change-Id: I09074c440430580fcfb2581275defe61c63c8ae8
2015-07-14 18:48:07 -07: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
189f313661 am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '987241265b77542f45ce95838c25beeaf3ae6849':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:00:44 +00:00
Fyodor Kupolov
987241265b Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev 2015-07-15 00:48:40 +00:00
Adam Lesinski
903ebd153b am 56d82dd2: BatteryStats: Fix deadlock
* commit '56d82dd28a3c7dcca9c9dc37a73a1cf5fc44498e':
  BatteryStats: Fix deadlock
2015-07-15 00:39:09 +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
56d82dd28a BatteryStats: Fix deadlock
Bug:22486756
Change-Id: I20e10cc344b128bfa156c5aada93d3fb2b0fcaa3
2015-07-15 00:25:26 +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
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
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
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
Svetoslav
ddae5f1e58 am 8b6d5b6b: Merge "Clear binder id when determining external storage state" into mnc-dev
* commit '8b6d5b6b6ac3c363ad7aa36873dec1701d33de1e':
  Clear binder id when determining external storage state
2015-07-14 19:51:25 +00:00
Dan Sandler
50e79b9fd0 am 66cc6bb6: Merge "Allow notification strings to be unredacted in dump output." into mnc-dev
* commit '66cc6bb65eac220a01b6a300cf64f1035a0463af':
  Allow notification strings to be unredacted in dump output.
2015-07-14 19:51:20 +00:00
Fyodor Kupolov
b4e7283c9a Allow array of required permissions in sendBroadcast
Added Context.sendBroadcast(Intent intent, String[] receiverPermissions)
method, which allows an array of required permissions to be enforced.

Bug: 21852542
Change-Id: I3b8ff258fa9f3249c344bb8093b820b24eef00c0
2015-07-14 12:50:22 -07:00
Svetoslav
8b6d5b6b6a Merge "Clear binder id when determining external storage state" into mnc-dev 2015-07-14 19:39:16 +00:00
Dan Sandler
66cc6bb65e Merge "Allow notification strings to be unredacted in dump output." into mnc-dev 2015-07-14 19:38:16 +00:00
Adrian Roos
9c013a2117 Merge "Show charging speed on Keyguard" into mnc-dr-dev 2015-07-14 19:17:07 +00:00
Svetoslav
38c3dbb209 Clear binder id when determining external storage state
bug:22472435

Change-Id: I5badd51cb9fb2244395880eb1bbff8f4aa0abb8c
2015-07-14 11:30:10 -07:00
Adrian Roos
7b04311d88 Show charging speed on Keyguard
Bug: 8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
2015-07-14 18:22:39 +00:00
Amit Mahajan
336f18ba28 am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
* commit '51b4e97ae42fb789b7d1c9d4134ddaa7e2b27b11':
  Add checks for READ_PRIVILEGED_PHONE_STATE.
2015-07-14 18:12:59 +00:00
Amit Mahajan
51b4e97ae4 Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev 2015-07-14 17:59:20 +00:00
Amit Mahajan
7c5befa4a7 Add checks for READ_PRIVILEGED_PHONE_STATE.
Callers will have either PRIVILEGED or regular READ_PHONE_STATE.

Bug: 22468536
Change-Id: I60251f61250a975f4147b027d2539824a728e3b5
2015-07-14 10:26:00 -07:00
Erik Kline
68bc390c0a am 77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
* commit '776129402746be08d52bb9f0901f6ecd63b25399':
  Log NetworkRequestInfo to get more detailed history
2015-07-14 06:07:04 +00:00
Svet Ganov
4248250c93 am 8017c647: Fix build
* commit '8017c647e665a6b6240501dc43628143ebe4e333':
  Fix build
2015-07-14 06:06:55 +00:00
Ian Pedowitz
d7be214ca4 resolved conflicts for merge of 8cee6587 to mnc-dr-dev
Change-Id: I0b2ed52214bb097d7fd69434afd0c6c890b5afb3
2015-07-13 22:58:29 -07:00
Erik Kline
7761294027 Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev 2015-07-14 04:09:29 +00:00
Erik Kline
7523eb349e Log NetworkRequestInfo to get more detailed history
Bug: 21641983
Bug: 22235775
Bug: 22299819
Bug: 22358164
Change-Id: I48a2d162dd499a3590f06d805267a63822856969
2015-07-14 11:46:51 +09:00
Svet Ganov
8017c647e6 Fix build
Change-Id: I2c97e405eaec7ee1569fcddc872ff2a98c829efe
2015-07-14 02:38:07 +00:00
Svet Ganov
8cee6587e0 Merge "Teach storage appops." into mnc-dev 2015-07-14 01:24:37 +00:00
Svet Ganov
6ee871e598 Teach storage appops.
For modern apps targeting M SDK and up the external storage state
is deterined by granted permissions. For apps targeting older SDK
the storage access is determined by app ops correspning to the
storage permissions as the latter are always granted.

When app ops change we do not remount as we kill the app process
in both cases enabling and disabling an app op since legacy code
is not prepared for dynamic behavior where an operation that failed
may next succeed. Hence, we remount when we start the app.

For modern apps we don't kill the app process on a permission
grant, therefore we synchronously remount the app storage.

bug:22104923

Change-Id: I601c19c764a74c2d15bea6630d0f5fdc52bf6a5a
2015-07-13 18:22:30 -07:00
Christopher Tate
c5eadf8d88 am 4b9b3e47: Merge "Default browser should not supersede intent filter priorities" into mnc-dev
* commit '4b9b3e4731ffb962daf0f5029450001a8a6e7c00':
  Default browser should not supersede intent filter priorities
2015-07-14 01:18:19 +00:00
Svet Ganov
7ca0c42db5 am fc2bc7f1: Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev
* commit 'fc2bc7f170ba564bc439fd22dd5a779d96670ffd':
  Check signatures of privileged persistent apps for granting defailt  permissions
2015-07-14 01:11:54 +00:00