Svet Ganov
5dc71cb2dd
am ffb43184: am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
...
* commit 'ffb4318447f7741b4901dd38e3f6d97c94794b42':
Grant default permissions to the setup app robustly.
2015-07-15 23:32:14 +00:00
Jeff Brown
4085a74b4c
am 209c8ced: am 6e4997db: am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager.
...
* commit '209c8cedab87359564c032a3e56b3acd452e1ac9':
Add USB port manager.
2015-07-15 23:30:28 +00:00
Svet Ganov
ffb4318447
am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
...
* commit '3d8e949a7767b204eb9504d3c5267de9e0fd6899':
Grant default permissions to the setup app robustly.
2015-07-15 23:18:40 +00:00
Jeff Brown
209c8cedab
am 6e4997db: am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager.
...
* commit '6e4997dbfb5f0a2abac99522a52b557172757ee2':
Add USB port manager.
2015-07-15 23:16:55 +00:00
Svet Ganov
9088c083e6
am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
...
* commit '12b05ec2e7a22fa0cbc1bc55d5a8b6503dbf038c':
Grant default permissions to the setup app robustly.
2015-07-15 22:46:01 +00:00
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
Jim Miller
aa1a35ba27
am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
...
* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
Improve tracking of screen on reasons.
2015-07-15 22:40:32 +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
Jim Miller
2e56339a4a
am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
...
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
Improve tracking of screen on reasons.
2015-07-15 22:26:05 +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
Svet Ganov
75f6b94a5d
Merge "Grant default permissions to the setup app robustly." into mnc-dev
2015-07-15 21:58:50 +00: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
Anthony Hugh
66cba90940
am 773f1b2f: am 26fa501d: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '773f1b2f919bb4c1f2724eabe8480b6589d8c498':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-07-15 21:08:39 +00: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
da74111e47
am de036f5d: am 60ca7690: am b72c1579: am 91202e59: am 503ad9ee: Merge "Fix input pause without resume." into mnc-dev
...
* commit 'de036f5dead5a9f6f7da6b3853345d9e777c1b15':
Fix input pause without resume.
2015-07-15 15:22:20 +00:00
George Mount
de036f5dea
am 60ca7690: am b72c1579: am 91202e59: am 503ad9ee: Merge "Fix input pause without resume." into mnc-dev
...
* commit '60ca7690bc556abe71869b05304ee469fa9546c5':
Fix input pause without resume.
2015-07-15 15:07:41 +00: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
Dianne Hackborn
e0d96ce96c
am 808dd5cc: am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564 : MMS should be receivied while Dozing" into mnc-dev
...
* commit '808dd5cc8af3e26d12c1b5fe80663eb306cc0c20':
Fix issue #21626564 : MMS should be receivied while Dozing
2015-07-15 02:37:04 +00:00
Fyodor Kupolov
32681a2d62
am 89aca46b: am 24cd9952: am d39b3d2d: am 0e45f873: am 4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
...
* commit '89aca46b1bce3d311b445905575633815d5eeda1':
Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
2015-07-15 02:36:56 +00:00
Dianne Hackborn
808dd5cc8a
am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564 : MMS should be receivied while Dozing" into mnc-dev
...
* commit '4753b5bcf4877e125a8e38d5bcd2ac46c1744429':
Fix issue #21626564 : MMS should be receivied while Dozing
2015-07-15 02:21:54 +00:00
Fyodor Kupolov
89aca46b1b
am 24cd9952: am d39b3d2d: am 0e45f873: am 4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
...
* commit '24cd99529935b60b3d1e391989e818fcd939546a':
Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
2015-07-15 02:21:48 +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
Fyodor Kupolov
b5143ecfee
am 1fa2a088: am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
...
* commit '1fa2a0888284ae00c905dce7a3003b995815467a':
Added sendBroadcastMultiplePermissions method
2015-07-15 01:58:48 +00: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
1fa2a08882
am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
...
* commit '1281575c257d52f256f4a08559611e6ec0b6190e':
Added sendBroadcastMultiplePermissions method
2015-07-15 01:42:58 +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
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
Yin-Chia Yeh
8a01a51752
am f8d436d8: am 5d27a838: am 3bb64f2d: am 9d513cec: am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
...
* commit 'f8d436d8522bcf3a6f9cfa4647a48fd3ba8ab325':
Camera: clarify largest JPEG dimension expectation
2015-07-15 00:11:52 +00:00
Fyodor Kupolov
9ac5983c7b
am 7aeb1a5c: am cf4617cf: am 1aeceef4: am fc4acfd9: am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
...
* commit '7aeb1a5c19a1226f2b0ca7b498bdad941d206808':
Revert "Allow array of required permissions in sendBroadcast"
2015-07-15 00:11:44 +00:00
Yin-Chia Yeh
f8d436d852
am 5d27a838: am 3bb64f2d: am 9d513cec: am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
...
* commit '5d27a838fac65e1fbdcebef4c6c9f62167a55448':
Camera: clarify largest JPEG dimension expectation
2015-07-14 23:55:56 +00:00
Fyodor Kupolov
7aeb1a5c19
am cf4617cf: am 1aeceef4: am fc4acfd9: am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
...
* commit 'cf4617cfd0c9da1fa5a12da5ed576dd0c823f8e5':
Revert "Allow array of required permissions in sendBroadcast"
2015-07-14 23:55:48 +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
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
Fyodor Kupolov
34ff2b04c9
am 64e8aa18: am 7f006b52: am 70174794: am ef77c116: am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
...
* commit '64e8aa18f8c089989113ecd8775d41bffe74b41d':
Allow array of required permissions in sendBroadcast
2015-07-14 23:10:56 +00:00
Fyodor Kupolov
64e8aa18f8
am 7f006b52: am 70174794: am ef77c116: am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
...
* commit '7f006b52215634f37aa881157df6473b8e3dd803':
Allow array of required permissions in sendBroadcast
2015-07-14 22:56:11 +00:00