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

197732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
2fc3216e2f am facfbc52: (-s ours) Import translations. DO NOT MERGE 
* commit 'facfbc52d863b11138d7c67087f9b6b0e81765f9':
  Import translations. DO NOT MERGE
 2015-07-15 16:54:17 +00:00
Geoff Mendal
facfbc52d8 Import translations. DO NOT MERGE 
Change-Id: I54d30125585b48fa3d419a991802ce6152b9cbcd
Auto-generated-cl: translation import
 2015-07-15 11:30:20 -05:00
Jeff Sharkey
04ec6f4f09 Only send EXTRA_STACK for private intent. 
Since it's a private Parcelable class, we can't send it to other
third-party apps, since they won't know how to unpack it.

Bug: 22255387
Change-Id: Ie2ea6cf72b733bd122eb3581a5df295cec608425
 2015-07-15 09:13:14 -07:00
Geoff Mendal
f99a13992d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-15 15:59:33 +00:00
Geoff Mendal
1b379b2bf4 am b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'b4ac0141b01d98f0d750d9303a670b17e2f76f37':
  Import translations. DO NOT MERGE
 2015-07-15 15:57:39 +00:00
Geoff Mendal
06ef540a58 Import translations. DO NOT MERGE 
Change-Id: If03fa3692f5b0494d3255dbda93aab624f2e3b59
Auto-generated-cl: translation import
 2015-07-15 10:55:07 -05:00
Geoff Mendal
b4ac0141b0 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 15:47:01 +00:00
Geoff Mendal
31c409648d Import translations. DO NOT MERGE 
Change-Id: I03908869f5a297a5400488f13e57999c4e883db0
Auto-generated-cl: translation import
 2015-07-15 10:43:54 -05: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
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
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
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
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
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
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
903ebd153b am 56d82dd2: BatteryStats: Fix deadlock 
* commit '56d82dd28a3c7dcca9c9dc37a73a1cf5fc44498e':
  BatteryStats: Fix deadlock
 2015-07-15 00:39:09 +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
56d82dd28a BatteryStats: Fix deadlock 
Bug:22486756
Change-Id: I20e10cc344b128bfa156c5aada93d3fb2b0fcaa3
 2015-07-15 00:25:26 +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
Adrian Roos
2609883606 Show correct locked orientation on phones 
Bug: 22487750
Change-Id: I1feaaf1e569c576c5212ef396732b2bbb5a0c0fc
 2015-07-14 23:44:25 +00:00
Eric Laurent
1691f73de5 AudioManager: fix audio device callback list access 
Bug: 22470616.
Change-Id: Ic59e8499557395dabe789b5fec9cb7c86c13d10c
 2015-07-14 16:27:54 -07: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
xinhe
44ab51c635 am f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit 'f1c2a1f798fc029200291ca9d5bbedb1f483d428':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:13:08 +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