summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Defines task to front/back animations in styles_micro." into cw-e-devGus Prevas2015-12-291-0/+4
|\
| * Defines task to front/back animations in styles_micro.Gus Prevas2015-12-281-0/+4
| | | | | | | | | | Bug: 26112737 Change-Id: I9f8c1da21580d525c32a76f25e223dc24d012837
* | Merge "Remove duplicate Bluetooth profiles." into cw-e-devBryce Lee2015-12-181-12/+0
|\ \
| * | Remove duplicate Bluetooth profiles.Bryce Lee2015-12-181-12/+0
| | | | | | | | | | | | Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
* | | Merge "Making ViewRootImpl drop input events when the Activity is in ambient ↵Daniel Koulomzin2015-12-181-1/+11
|\ \ \ | | | | | | | | | | | | mode." into cw-e-dev
| * | | Making ViewRootImpl drop input events when the Activity is in ambientDaniel Koulomzin2015-12-181-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode. WearableActivityController tells ViewRootImpl about ambient mode. Bug: 25912259 Bug: 25973146 Bug: 25714113 Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
* | | | resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: ↵Robert Greenwalt2015-12-180-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce * commit '3927089cce9d43a0b517f53fd6a542f07cb0955b': Protect some new broadcasts.
| * \ \ \ resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: ↵Robert Greenwalt2015-12-180-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 * commit '1e04dfb926040a6fad073fca0835777123d155e7': Protect some new broadcasts.
| | * \ \ \ resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: ↵Robert Greenwalt2015-12-180-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 * commit '81674b1ff5deedcf2f1a79f07441e506a4f66354': Protect some new broadcasts.
| | | * \ \ \ resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: ↵Robert Greenwalt2015-12-180-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5946a9b798 am: 2ecc918bd3 * commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84': Protect some new broadcasts.
| | | | * \ \ \ resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489Robert Greenwalt2015-12-180-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5946a9b798 * commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6': Protect some new broadcasts.
| | | | | * \ \ \ resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.Robert Greenwalt2015-12-180-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5a77651489 * commit '5a77651489ace080671034a85e5771c6ddc73525': Protect some new broadcasts.
| | | | | | * \ \ \ resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.Robert Greenwalt2015-12-170-0/+0
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
| | | | | | | * | | | Protect some new broadcasts.Robert Greenwalt2015-12-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEFAULT_*_SUBSCRIPTION_CHANGED broadcasts were added but not protected, allowing 3rd parties to potentially spoof the bcasts feeding misinformation to system listeners. bug:25778215 Change-Id: Ie5fc68a7d2224ce3f6beeca91667fe9b7654f0d5
* | | | | | | | | | | Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32feRobert Greenwalt2015-12-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 628b8f1f5f * commit '628b8f1f5f6d249e2f222602352d14c40d648d97': Check permissions on getDeviceId.
| * | | | | | | | | Merge "Check permissions on getDeviceId." into mnc-devRobert Greenwalt2015-12-170-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4557ef32fe * commit '4557ef32fe36b6f7ef7918052400d18af51d452f': Check permissions on getDeviceId.
| | * | | | | | | | Merge "Check permissions on getDeviceId." into mnc-devRobert Greenwalt2015-12-172-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Check permissions on getDeviceId.Robert Greenwalt2015-12-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs the package name passed in, so the aidl changes. bug:25778215 Change-Id: I804e6613ce0de5f2c7ab832ae62aecf269a6d213
* | | | | | | | | | | Merge "Check permissions on getDeviceId." into mnc-dr-devRobert Greenwalt2015-12-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ef58df63d6 * commit 'ef58df63d6ba9d56620b6a440f15d0e07c842a44': Check permissions on getDeviceId.
| * | | | | | | | | | Merge "Check permissions on getDeviceId." into mnc-dr-devRobert Greenwalt2015-12-172-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Check permissions on getDeviceId.Robert Greenwalt2015-12-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs the package name passed in, so the aidl changes. bug:25778215 Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360
* | | | | | | | | | | | Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-devBryce Lee2015-12-174-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add setting for declaring disabled bluetooth profiles.Bryce Lee2015-12-164-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25900899 Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
* | | | | | | | | | | | | Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-devBryce Lee2015-12-171-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add UUID to BluetoothHeadsetClientCallBryce Lee2015-12-161-2/+24
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow for unique identification of a call as id only provides uniqueness per session. Bug: 26016489 Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
* | | | | | | | | | | | | DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638Adam Lesinski2015-12-161-151/+285
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | / / / / / / / / / / | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 40d1ab91d2 * commit '40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512': DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
| * | | | | | | | | | | DO NOT MERGE: AAPT: Dump uses-permission-sdk-23Adam Lesinski2015-12-161-151/+285
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | / / / / / / / / | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b2c5155638 * commit 'b2c51556382acd3981e5a6380e2fb3d85c2f68a5': DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
| | * | | | | | | | | DO NOT MERGE: AAPT: Dump uses-permission-sdk-23Adam Lesinski2015-12-161-151/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include <uses-permission-sdk-23> permissions in dump badging and dump permissions. This will also add implied features for that permission, marked as -sdk-23 features. Ex: uses-permission: name='android.permission.ACCESS_FINE_LOCATION' uses-permission-sdk-23: name='android.permission.CAMERA' feature-group: label='' uses-feature: name='android.hardware.location' uses-implied-feature: name='android.hardware.location' reason='...' uses-feature-sdk-23: name='android.hardware.camera' uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...' Bug:24939655 Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3 (cherry picked from commit 5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-165-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-155-10/+10
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-165-34/+34
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-155-34/+34
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88 Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-2/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28f308a8339779f14ccf90581665624317afb4d3 Auto-generated-cl: translation import
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-1515-37/+37
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e Auto-generated-cl: translation import
* | | | | | | | | | | Allow access to deprecated LOCK_PATTERN_ENABLED flag.Bryce Lee2015-12-142-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible that older platforms may have not cleared the lock pattern, but instead only checked this flag to determine the lock pattern enabled state. In such cases, upgrading to a platform with that only checks the lock pattern can lead to the lock screen being re-enabled by accident. These new methods allow this condition to be identified and resolved. Bug: 26029690 Change-Id: I8f7ebc0e1915049afe49c219c87010aa38a16244
* | | | | | | | | | | Improve logging in BluetoothHeadsetClientCall.Bryce Lee2015-12-081-2/+6
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26032099 Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
* | | | | | | | | | Merge "Add rotary encoder input source" into cw-e-devPrashant Malani2015-12-082-0/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add rotary encoder input sourcePrashant Malani2015-08-282-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devices which have rotating encoders for input devices can mark their MotionEvents as belonging to SOURCE_ROTARY_ENCODER. This is better than mapping such input events to pre-existing input sources, which may result is conflation regarding the expected behaviour of these older input sources. Events emanating from this input soruce will be accessible to the View hierarchy via onGenericMotionEvent(). We also introduce a new axis constant, AXIS_SCROLL, for axis movements that aren't strictly vertical or horizontal. Bug: 18707397 Change-Id: I1ad9af7c87b97d2c98b58b71cab2b780d0c86ec3
* | | | | | | | | | | Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-devChenjie Luo2015-12-071-11/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check NPE beforehand instead of catching it at runtimeChenjie Luo2015-12-031-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix the page fault when watch rings during incoming call Bug: 25904666 Change-Id: Ia7e6db0628108dbf298e3811a846534ba69c0b46
* | | | | | | | | | | | Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143dEino-Ville Talvala2015-12-051-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: add4b91d41 * commit 'add4b91d41d3ba810b6b25c14d7c13050394f201': Camera: codegen doc update
| * | | | | | | | | | | Merge "Camera: codegen doc update" into mnc-devEino-Ville Talvala2015-12-041-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 69c5e7143d * commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff': Camera: codegen doc update
| | * | | | | | | | | | Merge "Camera: codegen doc update" into mnc-devEino-Ville Talvala2015-12-041-5/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
generated by cgit v1.1 at 2025-01-25 08:22:51 +0000