summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am af468add: am 58295e71: Merge "Add Null checks while processing pairing ↵Sanket Padawe2015-07-091-1/+3
|\ | | | | | | | | | | | | cancel intent" into mnc-dev * commit 'af468addb672ef002dee64376bc06f2bf8c6c0f9': Add Null checks while processing pairing cancel intent
| * am 58295e71: Merge "Add Null checks while processing pairing cancel intent" ↵Sanket Padawe2015-07-091-1/+3
| |\ | | | | | | | | | | | | | | | | | | into mnc-dev * commit '58295e71d293c131508d280f1373d94716348b2e': Add Null checks while processing pairing cancel intent
| | * Merge "Add Null checks while processing pairing cancel intent" into mnc-devSanket Padawe2015-07-091-1/+3
| | |\
| | | * Add Null checks while processing pairing cancel intentSanket Padawe2015-07-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use case: Exception while handling pairing cancel Intent received 1. Initiate pairing from DUT to remote 2. Power off DUT after getting pairing popup Root Cause:Crash observed in settings application Change-Id: Ia05fe196ecf6a1d4ec26f85b0cf984e23089c728 Fix: Fixed by adding Null check in PairingCancelHandler
* | | | am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt ↵Adam Lesinski2015-07-093-39/+34
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | battery stats" into mnc-dev * commit '1549adb4eaef28ef41ebd063df1e339de035e19d': BatteryStats: Fail gracefully on corrupt battery stats
| * | | am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" ↵Adam Lesinski2015-07-093-39/+34
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '7fb1655a891de275ab8a752294c42b9c13352af6': BatteryStats: Fail gracefully on corrupt battery stats
| | * | Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-devAdam Lesinski2015-07-093-39/+34
| | |\ \ | | | |/ | | |/|
| | | * BatteryStats: Fail gracefully on corrupt battery statsAdam Lesinski2015-07-083-39/+34
| | | | | | | | | | | | | | | | | | | | Bug:22328963 Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
* | | | am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."Filip Gruszczynski2015-07-091-6/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '45eb3ea667dac8d97a91781f01875148bacfe74c': Revert "Fix NPE when requesting outsets for detached view."
| * | | | Revert "Fix NPE when requesting outsets for detached view."Filip Gruszczynski2015-07-091-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b010291ace13947fcc76b1a64eaa67880e15f0a6. Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
* | | | | am 7649e156: am de335a7d: Merge "Fix Permission Typo." into mnc-devRobert Greenwalt2015-07-091-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '7649e156ca61f1d72a9fa0a2a2120f49a61fee2f': Fix Permission Typo.
| * | | | am de335a7d: Merge "Fix Permission Typo." into mnc-devRobert Greenwalt2015-07-091-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'de335a7dc4dcd6b1de8f4c455184f4c82d42612d': Fix Permission Typo.
| | * | | Merge "Fix Permission Typo." into mnc-devRobert Greenwalt2015-07-091-1/+1
| | |\ \ \
| | | * | | Fix Permission Typo.Robert Greenwalt2015-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no 'd' in privilege. And there is no spell checking in Manifests. bug:22358954 Change-Id: Ia122f51a81dc35760f277e23fe0f5a6d3d739457
* | | | | | am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating ↵Mady Mellor2015-07-091-19/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tool bar popups" into mnc-dev * commit 'e46094c4388412f996292af73acb0b9fda99ffcd': Use hint text to position handle / floating tool bar popups
| * | | | | am 84005b40: Merge "Use hint text to position handle / floating tool bar ↵Mady Mellor2015-07-091-19/+21
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | popups" into mnc-dev * commit '84005b40499c0e9cc914afd69570c1f78c92b8d1': Use hint text to position handle / floating tool bar popups
| | * | | | Merge "Use hint text to position handle / floating tool bar popups" into mnc-devMady Mellor2015-07-091-19/+21
| | |\ \ \ \
| | | * | | | Use hint text to position handle / floating tool bar popupsMady Mellor2015-07-081-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In situations where the hint text does not match the direction of the TextView's primary selection, when you copy text, and long press in that EditText to paste, the cursor would use the direction of the hint text to be placed, whereas the handle and floating tool bar used the TextView's direction to be placed so they wouldn't match. This CL updates the handle view and floating tool bars to use the hint text direction when appropriate. Bug: 21480429 Change-Id: I8090a5b2738c035522c307535ffa165ca024e811
* | | | | | | am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and ↵Svetoslav2015-07-093-79/+155
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package uninstall." into mnc-dev * commit 'c88dec321b666092735263dbb247c56e45186abf': Fix reset permissions on clear data and package uninstall.
| * | | | | | am 6638c182: Merge "Fix reset permissions on clear data and package ↵Svetoslav2015-07-093-79/+155
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uninstall." into mnc-dev * commit '6638c182635c6af036980ebdacc9c88411dcf583': Fix reset permissions on clear data and package uninstall.
| | * | | | | Merge "Fix reset permissions on clear data and package uninstall." into mnc-devSvetoslav2015-07-083-79/+155
| | |\ \ \ \ \
| | | * | | | | Fix reset permissions on clear data and package uninstall.Svetoslav2015-07-083-79/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user clears data for an app we reset the permission but only the changes made by the user. We do not modify syste or policy flags and also ensure the permission that were granted by default are granted after the data wipe. This is the same as starting with a clean slate. If the package whose data is cleared is a part of a shared user we resent to initial state only the permissions that the cleared package contributed. Hence, if another package also declared the permission as used we do not clear the permission state as it is still in use. When a package is deleted for a user but still present for another user we reset its permissions to their inital state follwoing above described strategy. Lastly when a preinstalled package wtih an upgrade is diabled (triggers upgrade uninstall) and this package is a part of a shared user, we do not drop permission state (grants and flags) for permissions used by the shadowed system package. This ensures that we do not drop runtime permission state (such state is default grants and user changes).i bug:22248525 Change-Id: I3a3007476d2cb9f4ff824e1e137a6e1a4d04408b
* | | | | | | | am c69e1410: am 9b84b5c5: Merge "Update storage group icon" into mnc-devSvet Ganov2015-07-091-7/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c69e14103b23b689a5271e7ca8cdef823d4039ff': Update storage group icon
| * | | | | | | am 9b84b5c5: Merge "Update storage group icon" into mnc-devSvet Ganov2015-07-091-7/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b84b5c5131634ad81b161cb1806d4f5197e1712': Update storage group icon
| | * | | | | | Merge "Update storage group icon" into mnc-devSvet Ganov2015-07-081-7/+4
| | |\ \ \ \ \ \
| | | * | | | | | Update storage group iconSvet Ganov2015-07-081-7/+4
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22316881 Change-Id: I64ea70d0d195721bbe12a5b673a010254b952e2f
* | | | | | | | am 379aa438: am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast ↵Jack Yu2015-07-091-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev * commit '379aa4389a5d8b5c45d1e1eb7a7cecf02b4ee939': Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
| * | | | | | | am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which ↵Jack Yu2015-07-091-0/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emergency/non-emergency broadcast messages from the network." into mnc-dev * commit '6b7a07848b21001a41aea1b6426ec2f75ea652ec': Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
| | * | | | | | Merge "Grant SMS permissions to Cell Broadcast receiver which ↵Jack Yu2015-07-081-0/+10
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | emergency/non-emergency broadcast messages from the network." into mnc-dev
| | | * | | | | | Grant SMS permissions to Cell Broadcast receiver which ↵Jack Yu2015-07-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emergency/non-emergency broadcast messages from the network. bug: 22229152 Change-Id: Ide02f0c3faafd37b8205f92df8a33a0bc95dd3d7
* | | | | | | | | am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when ↵Amith Yamasani2015-07-091-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | granting permissions" into mnc-dev * commit '370c27c7fe308e351d375295d422df76f7ede164': Qualify the uid with the userId when granting permissions
| * | | | | | | | am 705ba960: Merge "Qualify the uid with the userId when granting ↵Amith Yamasani2015-07-091-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions" into mnc-dev * commit '705ba9606325df6575d171ee96811d215e69b4e8': Qualify the uid with the userId when granting permissions
| | * | | | | | | Merge "Qualify the uid with the userId when granting permissions" into mnc-devAmith Yamasani2015-07-081-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Qualify the uid with the userId when granting permissionsAmith Yamasani2015-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to remountUid() for secondary users was not using the correct uid. This would prevent providing the required storage permissions to default apps. Discovered when investigating bug: 22356546 Change-Id: I98c8f6da724e46331c1c90b95969ca0871ef4fe9
* | | | | | | | | | am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should ↵Wale Ogunwale2015-07-091-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be finished after pausing" into mnc-dev * commit '1fee5522b60d9c24c9b30b5c995e72df191f7d50': Finish already paused activity if it should be finished after pausing
| * | | | | | | | | am dad62b9f: Merge "Finish already paused activity if it should be finished ↵Wale Ogunwale2015-07-081-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after pausing" into mnc-dev * commit 'dad62b9f993b95bb9a0c20d29c69d35bd7531008': Finish already paused activity if it should be finished after pausing
| | * | | | | | | | Merge "Finish already paused activity if it should be finished after ↵Wale Ogunwale2015-07-081-0/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | pausing" into mnc-dev
| | | * | | | | | | Finish already paused activity if it should be finished after pausingWale Ogunwale2015-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the app requests its activity to be finished allow it to be finished immediately if the activity is already paused. Bug: 22170595 Change-Id: I1ecc0d5f3b85fd80cbe8cdc1d4e32d5c6a50b20c
* | | | | | | | | | am b010291a: Fix NPE when requesting outsets for detached view.Filip Gruszczynski2015-07-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b010291ace13947fcc76b1a64eaa67880e15f0a6': Fix NPE when requesting outsets for detached view.
| * | | | | | | | | Fix NPE when requesting outsets for detached view.Filip Gruszczynski2015-07-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outsets are used during measure/layout pass, but this can be called on a view that is not currently attached. Bug: 21602590 Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78 (cherry picked from commit e660d4e96a2e5ac35f2dd6e2b43c588dd7e28358)
* | | | | | | | | | am 435c4013: am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-devJeff Sharkey2015-07-081-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '435c4013f5c26d380dbb3360c3958b37796ff3c1': Fix crash looping SystemUI.
| * | | | | | | | | am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-devJeff Sharkey2015-07-081-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f4c4ee66632e1355afa1218021ed728a99f7415': Fix crash looping SystemUI.
| | * | | | | | | | Merge "Fix crash looping SystemUI." into mnc-devJeff Sharkey2015-07-081-0/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix crash looping SystemUI.Jeff Sharkey2015-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22358954 Change-Id: Ie8539d7f866ae722edd071f6b20e8f8881d82434
* | | | | | | | | | | am 02f91c02: am 9201385f: Merge "Cleaned up the clipping logic for the ↵Selim Cinek2015-07-085-11/+56
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dismiss motion." into mnc-dev * commit '02f91c024e67eb408aee9e84f133290cf732d5a1': Cleaned up the clipping logic for the dismiss motion.
| * | | | | | | | | | am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." ↵Selim Cinek2015-07-085-11/+56
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '9201385f2e59d58bc52a5fbe5a3b666850dcae5f': Cleaned up the clipping logic for the dismiss motion.
| | * | | | | | | | | Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-devSelim Cinek2015-07-085-11/+56
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Cleaned up the clipping logic for the dismiss motion.Selim Cinek2015-07-085-11/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications are now not clipped anymore during the animation and it is ensured that the State is always correctly reset after the animation. Bug: 22232352 Change-Id: Ic873a0b119d5f71c29f5fd9b76a7bee1ae74638b
* | | | | | | | | | | | am baad8d36: am 224f0369: Merge "com.android.mms is no more, so removing ↵Ian Pedowitz2015-07-081-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from default_sms_application" into mnc-dev * commit 'baad8d36a1f4e2edf9d55d55c73c4a5cdd04c0cd': com.android.mms is no more, so removing from default_sms_application
| * | | | | | | | | | | am 224f0369: Merge "com.android.mms is no more, so removing from ↵Ian Pedowitz2015-07-081-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default_sms_application" into mnc-dev * commit '224f0369ca2ab6265379ce170c8779a7385a33f3': com.android.mms is no more, so removing from default_sms_application
generated by cgit v1.1 at 2025-04-02 19:41:02 +0000