summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing ↵Adam Powell2015-07-151-2/+24
|\ | | | | | | | | | | | | action modes" into mnc-dev * commit '18709f9a0095afe6dba11f9dd71e3210c5f4e1db': Relax strict ActionMode instance checking when finishing action modes
| * Merge "Relax strict ActionMode instance checking when finishing action ↵Adam Powell2015-07-151-2/+24
| |\ | | | | | | | | | modes" into mnc-dev
| | * Relax strict ActionMode instance checking when finishing action modesAdam Powell2015-07-141-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-devDianne Hackborn2015-07-151-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '63461e61b9aba2514fb39f87b8741b6db1f7e5d7': Bump mms whitelist time up to 1 minute.
| * | Merge "Bump mms whitelist time up to 1 minute." into mnc-devDianne Hackborn2015-07-151-1/+1
| |\ \
| | * | Bump mms whitelist time up to 1 minute.Dianne Hackborn2015-07-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I09074c440430580fcfb2581275defe61c63c8ae8
* | | | am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while ↵Dianne Hackborn2015-07-1511-64/+227
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Dozing" into mnc-dev * commit 'f1f8b9cc3ff5774e695568e8f02b018c0fd02844': Fix issue #21626564: MMS should be receivied while Dozing
| * | | Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-devDianne Hackborn2015-07-1511-64/+227
| |\ \ \ | | |/ /
| | * | Fix issue #21626564: MMS should be receivied while DozingDianne Hackborn2015-07-1411-64/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND ↵Fyodor Kupolov2015-07-151-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | broadcast" into mnc-dev * commit '4044440d2c1a9d185a3379b88d88c96f8e234887': Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
| * | | Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-devFyodor Kupolov2015-07-151-1/+2
| |\ \ \
| | * | | Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcastFyodor Kupolov2015-07-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Receivers of ACTION_FOUND intent are now required to have ACCESS_COARSE_LOCATION permission. Bug: 21852542 Change-Id: I8306f7431f067ca36bfc568a912385153fa3d496
* | | | | am bd874b8b: Merge "AudioManager: fix audio device callback list access" ↵Eric Laurent2015-07-151-16/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'bd874b8be717110148e2b284f35d166b11c1fe7d': AudioManager: fix audio device callback list access
| * | | | Merge "AudioManager: fix audio device callback list access" into mnc-devEric Laurent2015-07-151-16/+15
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | AudioManager: fix audio device callback list accessEric Laurent2015-07-141-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22470616. Change-Id: Ic59e8499557395dabe789b5fec9cb7c86c13d10c
* | | | | am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-devFyodor Kupolov2015-07-1512-111/+218
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '987241265b77542f45ce95838c25beeaf3ae6849': Added sendBroadcastMultiplePermissions method
| * | | | Merge "Added sendBroadcastMultiplePermissions method" into mnc-devFyodor Kupolov2015-07-1512-111/+218
| |\ \ \ \
| | * | | | Added sendBroadcastMultiplePermissions methodFyodor Kupolov2015-07-1412-111/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Context.sendBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions) method, which allows an array of required permissions to be enforced. Bug: 21852542 Change-Id: I27c9130e8f004b428452501ebc8a36aabde1f343
* | | | | | am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from ↵Adam Lesinski2015-07-151-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uid_cputime kernel module" into mnc-dev * commit '267240f2ddbaa0ea2828d7466f310c6ffc7c91cd': BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
| * | | | | Merge "BatteryStats: Clear power use when removing a UID from uid_cputime ↵Adam Lesinski2015-07-151-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | kernel module" into mnc-dev
| | * | | | | BatteryStats: Clear power use when removing a UID from uid_cputime kernel moduleAdam Lesinski2015-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:22461683 Change-Id: Iffb847268d2872bd2a843e28dc41fa22b1e36828
* | | | | | | am 56d82dd2: BatteryStats: Fix deadlockAdam Lesinski2015-07-151-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '56d82dd28a3c7dcca9c9dc37a73a1cf5fc44498e': BatteryStats: Fix deadlock
| * | | | | | BatteryStats: Fix deadlockAdam Lesinski2015-07-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:22486756 Change-Id: I20e10cc344b128bfa156c5aada93d3fb2b0fcaa3
* | | | | | | am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution ↵Adam Lesinski2015-07-141-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calculation" into mnc-dev * commit 'd4c1861a536d022b00505c75c30529c50688f26a': BatteryStats: Fix units in wakelock distribution calculation
| * | | | | | Merge "BatteryStats: Fix units in wakelock distribution calculation" into ↵Adam Lesinski2015-07-141-3/+3
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | mnc-dev
| | * | | | | BatteryStats: Fix units in wakelock distribution calculationAdam Lesinski2015-07-141-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly for checkin stats, this is not used in any computation. Bug:22468534 Bug:22391540 Change-Id: Ib3d0c86db5044092d3d76acf8f001337272af2ff
* | | | | | am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into ↵Yin-Chia Yeh2015-07-141-2/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit 'b42cb352a350bac198470f65125aa151ecacff13': Camera: clarify largest JPEG dimension expectation
| * | | | | Merge "Camera: clarify largest JPEG dimension expectation" into mnc-devYin-Chia Yeh2015-07-141-2/+18
| |\ \ \ \ \
| | * | | | | Camera: clarify largest JPEG dimension expectationYin-Chia Yeh2015-07-081-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Codegen doc update. Bug: 22295208 Change-Id: I06f17579915bfaa640a26a42f0ce0b7549e35d3c
* | | | | | | am 4a817924: Merge "Revert "Allow array of required permissions in ↵Fyodor Kupolov2015-07-1411-214/+110
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sendBroadcast"" into mnc-dev * commit '4a817924ecb282eef48b06b92f8e1914edd6cec2': Revert "Allow array of required permissions in sendBroadcast"
| * | | | | | Merge "Revert "Allow array of required permissions in sendBroadcast"" into ↵Fyodor Kupolov2015-07-1411-214/+110
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| | * | | | | | Revert "Allow array of required permissions in sendBroadcast"Fyodor Kupolov2015-07-1411-214/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b4e7283c9afd9fb15ebd63f6ce9b75c9c1af658b. Change-Id: Ie8390964bda5bdfa869cee8f46584043d8e7c664
* | | | | | | | am f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" ↵xinhe2015-07-141-0/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'f1c2a1f798fc029200291ca9d5bbedb1f483d428': Need to disable 5GHz bands for WiFi tethering in Japan
| * | | | | | | Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-devxinhe2015-07-141-0/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Need to disable 5GHz bands for WiFi tethering in Japanxinhe2015-07-131-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/22396383 Change-Id: I61efef1babaab756425e6958843dfb9ad47b46cd
* | | | | | | | | am b63b031c: Merge "Standardize stateToString return values" into mnc-devYorke Lee2015-07-141-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b63b031cb5b9338daa3de76ee9976ba493037d92': Standardize stateToString return values
| * | | | | | | | Merge "Standardize stateToString return values" into mnc-devYorke Lee2015-07-141-6/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Standardize stateToString return valuesYorke Lee2015-07-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20303674 Change-Id: I884029614c8ce36120c1fc039ef33c0e6736ed5c
* | | | | | | | | | am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" ↵Fyodor Kupolov2015-07-1411-110/+214
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'd69a82c107cea4aca87eecc3978e21ea9bc23c82': Allow array of required permissions in sendBroadcast
| * | | | | | | | | Merge "Allow array of required permissions in sendBroadcast" into mnc-devFyodor Kupolov2015-07-1411-110/+214
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Allow array of required permissions in sendBroadcastFyodor Kupolov2015-07-1411-110/+214
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Context.sendBroadcast(Intent intent, String[] receiverPermissions) method, which allows an array of required permissions to be enforced. Bug: 21852542 Change-Id: I3b8ff258fa9f3249c344bb8093b820b24eef00c0
* | | | | | | | am d3719ab0: Merge "Better handling of storage paths." into mnc-devJeff Sharkey2015-07-142-12/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3719ab07a0ba66c019979ce19c45b77c4aae92e': Better handling of storage paths.
| * | | | | | | Merge "Better handling of storage paths." into mnc-devJeff Sharkey2015-07-142-12/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Better handling of storage paths.Jeff Sharkey2015-07-142-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give more details about why we failed to create storage paths, and search for underlying volumes using canonical paths. Bug: 22135060 Change-Id: I75d3584403ece310438b05f5b9fe72d94c9096c6
* | | | | | | | | am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-devChien-Yu Chen2015-07-141-8/+47
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6eec00ecf456b8a24487828b6f515cccc465cc1a': Camera: Reconnect after camera service crashes
| * | | | | | | | Merge "Camera: Reconnect after camera service crashes" into mnc-devChien-Yu Chen2015-07-141-8/+47
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Camera: Reconnect after camera service crashesChien-Yu Chen2015-07-131-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Schedule a reconnection after camera service crashes if any client registered a camera availability callback or torch status callback. Bug: 407755 Change-Id: Iabe0bf713863898ca468cff59d4c97c66a802630
* | | | | | | | | | Touch, wake and unlockJorim Jaggi2015-07-1417-145/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent the device from sleeping. - If we get a successful fingerprint, wake the device up, immediately dismiss the keyguard and tell PWM that we kicked off our frame that will represent the correct state. - PWM then waits for this frame to be drawn, and then turns on the screen, which results in unlocking directly to the previsouly opened app. Bug: 21855614 Change-Id: I0c43bcc9d334b509632704fb0c123ab3351edff2
* | | | | | | | | | am 5cf30c60: Merge "Pass wifi ap state through to tile when receiver ↵Julia Reynolds2015-07-142-3/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | triggered." into mnc-dev * commit '5cf30c608f21a9685310e6cf7d5970c8b7fb36c8': Pass wifi ap state through to tile when receiver triggered.
| * | | | | | | | | Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-devJulia Reynolds2015-07-142-3/+9
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-20 04:45:01 +0000