Commit Graph

55688 Commits

Author SHA1 Message Date
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
Adam Powell
1e8e63754a am 45756ec5: am 86234afe: am 19dd44c2: am 5e078458: am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
* commit '45756ec5ab3c59152464f63a0cbe4566ebf4fa32':
  Relax strict ActionMode instance checking when finishing action modes
2015-07-15 03:36:11 +00:00
Adam Powell
45756ec5ab am 86234afe: am 19dd44c2: am 5e078458: am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
* commit '86234afe59c53d957d8cd5281045ac8aeea69961':
  Relax strict ActionMode instance checking when finishing action modes
2015-07-15 03:24:15 +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
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
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
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
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
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
Adam Lesinski
94e2638e38 am f488fc28: am c678d23d: am f96a3386: am e5c0550d: am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
* commit 'f488fc28102870d8ec943d0a3a78c6d3997711c2':
  BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
2015-07-15 01:36:32 +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
Adam Lesinski
f488fc2810 am c678d23d: am f96a3386: am e5c0550d: am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
* commit 'c678d23d987a5b72abfca6f5e383140e9cb543db':
  BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
2015-07-15 01:22:26 +00: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
a4359a32ff am b6675209: am 9de0c930: am b3b21b46: am d4d190ca: am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
* commit 'b6675209e21f3f0d12f7323385891e68030baac8':
  BatteryStats: Fix units in wakelock distribution calculation
2015-07-15 00:12:01 +00: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
Adam Lesinski
b6675209e2 am 9de0c930: am b3b21b46: am d4d190ca: am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
* commit '9de0c930ef7cd683c0449d051c26f31e67b3f817':
  BatteryStats: Fix units in wakelock distribution calculation
2015-07-14 23:56:01 +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
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
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
Adam Lesinski
d4c1861a53 Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev 2015-07-14 23:00:24 +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
Yin-Chia Yeh
b42cb352a3 Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev 2015-07-14 22:53:11 +00:00