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

197173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
31c409648d Import translations. DO NOT MERGE 
Change-Id: I03908869f5a297a5400488f13e57999c4e883db0
Auto-generated-cl: translation import
 2015-07-15 10:43:54 -05: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
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
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
987241265b Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev 2015-07-15 00:48:40 +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
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
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
Fyodor Kupolov
4a817924ec Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev 2015-07-14 22:43:47 +00:00
xinhe
f1c2a1f798 Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 2015-07-14 22:29:23 +00:00
Fyodor Kupolov
e37520b49d Revert "Allow array of required permissions in sendBroadcast" 
This reverts commit b4e7283c9afd9fb15ebd63f6ce9b75c9c1af658b.

Change-Id: Ie8390964bda5bdfa869cee8f46584043d8e7c664
 2015-07-14 22:29:21 +00:00
Yorke Lee
b63b031cb5 Merge "Standardize stateToString return values" into mnc-dev 2015-07-14 22:00:33 +00:00
Fyodor Kupolov
d69a82c107 Merge "Allow array of required permissions in sendBroadcast" into mnc-dev 2015-07-14 21:57:34 +00:00
Jeff Sharkey
d3719ab07a Merge "Better handling of storage paths." into mnc-dev 2015-07-14 20:53:16 +00:00
Chien-Yu Chen
6eec00ecf4 Merge "Camera: Reconnect after camera service crashes" into mnc-dev 2015-07-14 20:48:56 +00:00
Adam Lesinski
062e66cb15 BatteryStats: Fix units in wakelock distribution calculation 
This is mostly for checkin stats, this is not used in any computation.

Bug:22468534
Bug:22391540
Change-Id: Ib3d0c86db5044092d3d76acf8f001337272af2ff
 2015-07-14 20:27:20 +00:00
Julia Reynolds
5cf30c608f Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev 2015-07-14 20:23:50 +00:00
Andrew Solovay
353886b2dd am e67416ec: am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs 
* commit 'e67416eccc6092e2fce3619b2244deda36fabd26':
  docs: Clarified how to find out when a switch is toggled
 2015-07-14 20:22:59 +00:00
Jason Monk
fb9732409a Merge "Fix status bar bt accessibility message" into mnc-dev 2015-07-14 20:21:08 +00:00
Jason Monk
2061049d69 Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 2015-07-14 20:20:36 +00:00
Jason Monk
1aa3282d12 Fix status bar bt accessibility message 
Use the same description for both QS and status bar.

Bug: 20345203
Change-Id: I5789c1385d2240e1ad426a008e6e2192885ddc2b
 2015-07-14 16:10:32 -04:00
Adam Lesinski
92a3914fb3 Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev 2015-07-14 20:08:43 +00:00
Jeff Sharkey
983294596e Better handling of storage paths. 
Give more details about why we failed to create storage paths, and
search for underlying volumes using canonical paths.

Bug: 22135060
Change-Id: I75d3584403ece310438b05f5b9fe72d94c9096c6
 2015-07-14 13:08:22 -07:00
Andrew Solovay
e67416eccc am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs 
* commit '4859a6125bcf967cf97339b19f30d9788b971e02':
  docs: Clarified how to find out when a switch is toggled
 2015-07-14 20:08:00 +00:00
Andrew Solovay
4859a6125b Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs 2015-07-14 19:59:07 +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
Svetoslav
46d1864cee Merge "Make get_accounts a runtime permissions again" into mnc-dev 2015-07-14 18:42:08 +00:00
Yorke Lee
e911c8d196 Standardize stateToString return values 
Bug: 20303674
Change-Id: I884029614c8ce36120c1fc039ef33c0e6736ed5c
 2015-07-14 11:39:36 -07:00
Fyodor Kupolov
72f491dd86 Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast 
Receivers of ACTION_FOUND intent are now required to have
ACCESS_COARSE_LOCATION permission.

Bug: 21852542
Change-Id: I8306f7431f067ca36bfc568a912385153fa3d496
 2015-07-14 11:38:58 -07:00
Adam Lesinski
67eea87e0d BatteryStats: Remove uid_cputime Slog.wtf for high cpu times 
High cpu times are expected as multiple cores can be running at the
same time, so comparing against the time between samples is incorrect.

I am reasonable certain that the values we see now are correct, so disabling this
check. However, checking for negative values (overflows) is still enabled and
will remain enabled because there is no case where we will be ok with negative deltas.

Bug:22461683
Change-Id: If9c7cdbb75ceaed059d1e0f4dd83cfdd3e021a93
 2015-07-14 11:33:53 -07:00
Svetoslav
38c3dbb209 Clear binder id when determining external storage state 
bug:22472435

Change-Id: I5badd51cb9fb2244395880eb1bbff8f4aa0abb8c
 2015-07-14 11:30:10 -07:00
Selim Cinek
f5adce8758 Merge "Removed logging for the empty keyguard" into mnc-dev 2015-07-14 18:27: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
Julia Reynolds
b8a46a6c77 Pass wifi ap state through to tile when receiver triggered. 
Bug: 22450078
Change-Id: I9b339aa2238a7427291bfdc2ef6aab58dcdb5cf3
 2015-07-14 13:56:03 -04:00
Jason Monk
fe03a84bc6 Merge "Fix QS labels on language change" into mnc-dev 2015-07-14 17:40:23 +00:00
Jason Monk
f05ca67ce4 Move wifi accessibility strings to SettingsLib 
Bug: 22468835
Change-Id: I66e85e8adfb3eda194995eda529422a172f00cbd
 2015-07-14 13:32:33 -04:00
Marco Nelissen
3ced96178b Merge "Use original path if translated path doesn't exist" into mnc-dev 2015-07-14 17:30:06 +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
Craig Lafayette
2f0116fa3a Merge "Prevent null allowableAccounts from crashing" into mnc-dev 2015-07-14 17:25:40 +00:00