drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,755 Commits 1 Branch 0 Tags
Commit Graph

200755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
d049253989 am fa4541da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'fa4541da009293a52fad1c8abee91682b3032029':
  Import translations. DO NOT MERGE
 2015-07-15 14:24:47 +00:00
Geoff Mendal
69a3ffa9f1 am 11b1579a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '11b1579a5f507fabedc6c2f0d7e48af79da93032':
  Import translations. DO NOT MERGE
 2015-07-15 14:24:43 +00:00
Geoff Mendal
d672983c5e am f5a8eb55: (-s ours) am 82ca8b0a: (-s ours) am 57d8be8b: (-s ours) Import translations. DO NOT MERGE 
* commit 'f5a8eb551aa16f58a079370f622d4f9103321a32':
  Import translations. DO NOT MERGE
 2015-07-15 14:24:43 +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
Geoff Mendal
fa4541da00 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-15 14:12:58 +00:00
George Mount
503ad9ee0d Merge "Fix input pause without resume." into mnc-dev 2015-07-15 14:12:28 +00:00
Geoff Mendal
11b1579a5f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-15 14:11:49 +00:00
Geoff Mendal
b0c7781637 am 35a682bf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '35a682bf9ff3b6b6e6cb83427f253d93c763fdc6':
  Import translations. DO NOT MERGE
 2015-07-15 14:09:35 +00:00
Geoff Mendal
42042b0def am 862ff6b6: (-s ours) am 94666b76: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '862ff6b6c8d513ca5cd79bb49194a5fe2543f9b5':
  Import translations. DO NOT MERGE
 2015-07-15 14:09:31 +00:00
Geoff Mendal
f5a8eb551a am 82ca8b0a: (-s ours) am 57d8be8b: (-s ours) Import translations. DO NOT MERGE 
* commit '82ca8b0a6b55d45cb92664983092faf738139bf8':
  Import translations. DO NOT MERGE
 2015-07-15 14:09:27 +00:00
Geoff Mendal
a000d1fe4d Import translations. DO NOT MERGE 
Change-Id: Ie56e8483ffa87f863bb76f29f73fcdeeb7b4b2b2
Auto-generated-cl: translation import
 2015-07-15 07:05:22 -07:00
Geoff Mendal
b5dd43bc70 Import translations. DO NOT MERGE 
Change-Id: I3dcb83456bc06643dd83016e764a1a71a8999656
Auto-generated-cl: translation import
 2015-07-15 07:04:38 -07:00
Geoff Mendal
35a682bf9f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-15 14:03:42 +00:00
Geoff Mendal
59c165b835 Import translations. DO NOT MERGE 
Change-Id: Ia22c5f2bb6f9dfc97e38af8fc3bffeda5086a4e4
Auto-generated-cl: translation import
 2015-07-15 07:01:17 -07:00
Geoff Mendal
862ff6b6c8 am 94666b76: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '94666b76988a6a6721a0d5c080f819580da912a2':
  Import translations. DO NOT MERGE
 2015-07-15 13:53:44 +00:00
Geoff Mendal
82ca8b0a6b am 57d8be8b: (-s ours) Import translations. DO NOT MERGE 
* commit '57d8be8bc016f088af9ad76e19f72d3bbe4ff325':
  Import translations. DO NOT MERGE
 2015-07-15 13:53:40 +00:00
Geoff Mendal
94666b7698 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 13:48:53 +00:00
Geoff Mendal
bb24571ae8 Import translations. DO NOT MERGE 
Change-Id: I4e7c446cc9fd0a34b81173a74cddc40c22b7b74b
Auto-generated-cl: translation import
 2015-07-15 06:47:39 -07:00
Geoff Mendal
57d8be8bc0 Import translations. DO NOT MERGE 
Change-Id: Ic93e9b866c3f933bab929f480a6b8098e585ed9c
Auto-generated-cl: translation import
 2015-07-15 06:42:54 -07:00
Adam Powell
86234afe59 am 19dd44c2: am 5e078458: am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev 
* commit '19dd44c2227c754906bfb257fc510ce155edef2a':
  Relax strict ActionMode instance checking when finishing action modes
 2015-07-15 03:10:14 +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
b3a578f4ad am 90f13b19: am aa7b1450: am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev 
* commit '90f13b19531b8520d19bc0c4103436fcf2816fce':
  Bump mms whitelist time up to 1 minute.
 2015-07-15 02:12:19 +00:00
Dianne Hackborn
4753b5bcf4 am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev 
* commit '4f73990a511df64c9a4eaba5768ca4c37325eba8':
  Fix issue #21626564: MMS should be receivied while Dozing
 2015-07-15 02:12:12 +00:00
Fyodor Kupolov
24cd995299 am d39b3d2d: am 0e45f873: am 4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev 
* commit 'd39b3d2d51e38c5fa4d538eb95cad76af8f10804':
  Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
 2015-07-15 02:12:04 +00:00
Eric Laurent
e6392988f4 am a29bcca2: am c2db03b0: am bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev 
* commit 'a29bcca25fffd006f8a3dd7c8df137cca22d418f':
  AudioManager: fix audio device callback list access
 2015-07-15 02:11:58 +00:00
Dianne Hackborn
90f13b1953 am aa7b1450: am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev 
* commit 'aa7b14501a5ac7ac5a0ec1425589d8c2bfa6fc17':
  Bump mms whitelist time up to 1 minute.
 2015-07-15 02:08:59 +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
Eric Laurent
a29bcca25f am c2db03b0: am bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev 
* commit 'c2db03b0b8627b177522db9e05d13112b9451b72':
  AudioManager: fix audio device callback list access
 2015-07-15 01:57:58 +00: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
63461e61b9 Merge "Bump mms whitelist time up to 1 minute." into mnc-dev 2015-07-15 01:49:55 +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
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
Eric Laurent
c2db03b0b8 am bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev 
* commit 'bd874b8be717110148e2b284f35d166b11c1fe7d':
  AudioManager: fix audio device callback list access
 2015-07-15 01:42:57 +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
Eric Laurent
bd874b8be7 Merge "AudioManager: fix audio device callback list access" into mnc-dev 2015-07-15 01:31:47 +00:00
Fyodor Kupolov
1281575c25 am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev 
* commit '41fac5e8906a37f78e9d3978509987dcedd18dca':
  Added sendBroadcastMultiplePermissions method
 2015-07-15 01:28:42 +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
Adam Lesinski
c678d23d98 am f96a3386: am e5c0550d: am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev 
* commit 'f96a33865b03ed092f6e902b4bea5ec5db481cdc':
  BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
 2015-07-15 01:08:32 +00:00
Adam Lesinski
6b456c1235 am 772c7b82: am 903ebd15: am 56d82dd2: BatteryStats: Fix deadlock 
* commit '772c7b82aedb4eb2103aa17cdbdc7131e214eef7':
  BatteryStats: Fix deadlock
 2015-07-15 01:08:26 +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
Adam Lesinski
772c7b82ae am 903ebd15: am 56d82dd2: BatteryStats: Fix deadlock 
* commit '903ebd153b7503bf958eb91a3a67cad9f6f5a955':
  BatteryStats: Fix deadlock
 2015-07-15 00:52:57 +00:00
Fyodor Kupolov
987241265b Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev 2015-07-15 00:48:40 +00:00