summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Constrain child width and height to >= 0 in FrameLayout.onMeasure()Alan Viverette2015-06-251-13/+14
| | | | | Bug: 22093669 Change-Id: I55e8a0289f871b73ed07f3d73e8297786f9acac1
* Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-devChris Manton2015-06-253-2/+18
|\
| * Carrier Config API KEY_FORCE_HOME_NETWORK_BOOLChris Manton2015-06-253-2/+18
| | | | | | | | | | | | Bug: 20828356 Change-Id: I30a286e7af884a11c51363916dd6a4dc965d399a
* | Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant ↵Yusuke Sato2015-06-253-14/+15
|\ \ | | | | | | | | | files" into mnc-dev
| * | Let findSupportedAbi and hasRenderscriptBitcode scan only relevant filesYusuke Sato2015-06-223-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | for better performance. Without the optimization, these two functions may check more than 100k file names in the pre-installed APK files, which can take a few seconds to finish even on a recent device. Bug: 21957428 Change-Id: I315fd3c6d5aa1076b993752525de449a9933de12
* | | Merge "Add comments for visual voicemail short codes in whitelist." into mnc-devNancy Chen2015-06-251-3/+6
|\ \ \
| * | | Add comments for visual voicemail short codes in whitelist.Nancy Chen2015-06-231-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the carriers and visual voicemail comment for US,FR,GB visual voicemail carriers. Bug: 20499563 Change-Id: Id77270ec384343e70b48cf4ce8ac45094e8b6d86
* | | | Merge "Refactoring recents search bar widget logic." into mnc-devWinson Chung2015-06-258-199/+136
|\ \ \ \
| * | | | Refactoring recents search bar widget logic.Winson Chung2015-06-248-199/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19062975 Change-Id: I303710598675aeebca8f34ac57de6249462ec033
* | | | | Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-devAlan Viverette2015-06-251-8/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Constrain width and height to >= 0 in FastScroller layoutAlan Viverette2015-06-251-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22071990 Change-Id: I9dcb2066ee069a3764b7d711cb341a4dfdc4445e
* | | | | Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-devAlex Klyubin2015-06-252-18/+66
|\ \ \ \ \
| * | | | | Support RSA encrypt using private key and PKCS#1 paddding.Alex Klyubin2015-06-252-18/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps such as OpenVPN Connect for some reason generate PKCS#1-padded RSA signatures using Cipher (initialized in Cipher.ENCRYPT_MODE with private key!) instead of using Signature. Unfortunately, RI supports this strange behavior and previous releases of Android Keystore did the same. So, we have to continue supporting this craziness. Bug: 22083023 Change-Id: Ife3950d0d4ceb4e44e08014635312c1252878b69
* | | | | | Merge "Fix: Don't display the drag handles when focus is lost" into mnc-devMady Mellor2015-06-252-11/+20
|\ \ \ \ \ \
| * | | | | | Fix: Don't display the drag handles when focus is lostMady Mellor2015-06-252-11/+20
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text selection handles should be hidden / shown when the window loses / regains focus. Additionally renames method to make more sense. Bug: 22062480 Change-Id: I6e160234cf112ee285367637e2f1c14defd82e89
* | | | | | Merge "EditText - can not drag handles in extracted mode" into mnc-devAndrei Stingaceanu2015-06-251-1/+2
|\ \ \ \ \ \
| * | | | | | EditText - can not drag handles in extracted modeAndrei Stingaceanu2015-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In TextView's onPreDraw method, startSelectionActionMode() is called, but the selection has already been started so in startSelectionActionMode() it shows the insertionController which hides the selectionController. Fix this by adding a check to start the action mode only if it is not already started. Bug: 22028858 Change-Id: I2999423155b7a63a7d879bc8ea5032e17dff459f
* | | | | | | Merge "[LockSettings] clear secure user id when user is removed" into mnc-devAndres Morales2015-06-251-0/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [LockSettings] clear secure user id when user is removedAndres Morales2015-06-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for QCOM HALs and for general good housekeeping Bug: 22011857 Change-Id: I6cc157a88ee125ecbf81fc51c226c63ba1d34b80
* | | | | | | Merge "Use standard copyright banner in android/security/keymaster." into ↵Alex Klyubin2015-06-2517-49/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | Use standard copyright banner in android/security/keymaster.Alex Klyubin2015-06-2417-49/+49
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: I22eec18130cc46222d50481164069e7714154979
* | | | | | | Merge "Track rename of INT and LONG Keymaster tag types." into mnc-devAlex Klyubin2015-06-255-28/+28
|\ \ \ \ \ \ \
| * | | | | | | Track rename of INT and LONG Keymaster tag types.Alex Klyubin2015-06-245-28/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22008538 Change-Id: Id0091e59738c828a96305edbfc4f3958e712278b
* | | | | | | Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-devJason Monk2015-06-251-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Make BluetoothEventManager listen to ALIAS_CHANGEDJason Monk2015-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20341903 Change-Id: Ibc0836bfd7f033f57ff6ae9c3ccce22fd92595f3
* | | | | | | | ICU format support for pseudolocalizes.Igor Viarheichyk2015-06-255-67/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom parser can handle nested ICU messages even if they are split into multiple fragments. Code reworked to encapsulate all pseudolocalization logic in Pseudolocalizer and PseudoMethods classes. To minimize a changelist size, some static functions remained. Fake BiDi pseudolocalization method is reimplemented to handle word boundaries correctly. Unit tests added. (cherry picked from commit cbb1e676b56677ae3585c067f29646dddffb4857) bug: 22060509 Change-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00
* | | | | | | | Merge "Don't lose critical success/failure messages" into mnc-devErik Kline2015-06-251-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't lose critical success/failure messagesErik Kline2015-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occasionally, "dumpsys connectivity --diag" will show measurement results without success or failure messages. Properly record the error before decrementing the countdown latch. Bug: 20733156 Change-Id: Ic654dedb753a65a96fe870f79fb296fbfc459fcb
* | | | | | | | | Merge "iUpdate the sensor group description" into mnc-devSvetoslav2015-06-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | iUpdate the sensor group descriptionSvetoslav2015-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:21784262 Change-Id: I417e2170b8a977b274ca0f6b2364c670bbb5264a
* | | | | | | | | | am a50fa710: (-s ours) am 001df9ca: DO NOT MERGE: Introduce stem keycodes ↵Anthony Hugh2015-06-250-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Wear * commit 'a50fa71044f759013dc506ae3dc5fce11e67494e': DO NOT MERGE: Introduce stem keycodes for Wear
| * \ \ \ \ \ \ \ \ \ am 001df9ca: DO NOT MERGE: Introduce stem keycodes for WearAnthony Hugh2015-06-252-2/+19
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '001df9ca900f3098222a4920a0048d2eb947bd4e': DO NOT MERGE: Introduce stem keycodes for Wear
| | * | | | | | | | | | DO NOT MERGE: Introduce stem keycodes for WearAnthony Hugh2015-06-242-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick from master This change adds four new stem keycodes for Android Wear. These keycodes are intended to represent the various hardware buttons around the watch. There is one primary stem key that will be used for power/settings and three generic stem keys that will be customizable. BUG: 21903503 Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
* | | | | | | | | | | | Merge "Make NONEwithECDSA truncate input when necessary." into mnc-devAlex Klyubin2015-06-258-44/+147
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make NONEwithECDSA truncate input when necessary.Alex Klyubin2015-06-248-44/+147
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keymaster's implementation of ECDSA with digest NONE rejects input longer than group size in bytes. RI's NONEwithECDSA accepts inputs of arbitrary length by truncating them to the above size. This CL makes Android Keystore's NONEwithECDSA do the truncation to keep the JCA and Keymaster happy. The change is inside AndroidKeyStoreECDSASignatureSpi$NONE. All other small modifications are for supporting that change by making it possible for AndroidKeyStoreSignatureSpiBase to pass in the signature being verified into KeyStoreCryptoOperationStreamer. This in turn is needed to make it possible for NONEwithECDSA implementation to provide a wrapper streamer which truncates input. Bug: 22030217 Change-Id: I26064f6df37ef8c631d70a36a356aa0b76a9ad29
* | | | | | | | | | | | Merge "Frameworks/base: Add tracing system properties" into mnc-devAndreas Gampe2015-06-251-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Frameworks/base: Add tracing system propertiesAndreas Gampe2015-06-221-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system properties to support zygote-started method tracing. These are needed as the limit on system properties does not allow the reuse of the runtime extra options system property. Bug: 21760614 Change-Id: I3785cc5715acadbee81ef7b45081ed780f1351d3
* | | | | | | | | | | | | Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-devDave Langemak2015-06-251-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Throw IAE on invalid measure spec size"Dave Langemak2015-06-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ac6cfb32fec5e4b9ce47c4cde4bbcc7b43a0c4a7. Change-Id: Ie60b48eac5f732071a5039b9b6bc7b18eb694d5b
* | | | | | | | | | | | | | Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into ↵Amith Yamasani2015-06-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | | No need to check WRITE_SETTINGS permission in ContentProviderAmith Yamasani2015-06-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permission checks are enforced within the SettingsProvider specifically for SECURE/SYSTEM/GLOBAL. Now WRITE_SETTINGS is runtime, so it shouldn't apply to all the settings types. Bug: 22044704 Change-Id: I9ed25d96b2fa4f46d3d049efa4300cd1d37bbd24
* | | | | | | | | | | | | | | Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-devAlan Viverette2015-06-251-11/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Avoid negative childSpecSize in RelativeLayoutAlan Viverette2015-06-241-11/+10
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22071351 Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
* | | | | | | | | | | | | | | Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-devAdam Powell2015-06-251-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix ChooserActivity check for still-alive ChooserTargetsAdam Powell2015-06-241-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only prune ChooserTargets if the resolved activity source they came from is still present after refreshing the list. Compare this directly against the ComponentName rather than ResolveInfo.equals, as the latter isn't implemented. Bug 21953672 Change-Id: I6486bda85c19d7371167affe2a2b80a2668bd734
* | | | | | | | | | | | | | | | Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-devztenghui2015-06-242-12/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Resize the VectorDrawable according to the virtual Dpiztenghui2015-06-242-12/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/21928507 Change-Id: I9e596192a0fdf13fc91481f990a345c3b267f225
* | | | | | | | | | | | | | | | | Merge "Update local state when creating LayerDrawable from constant state" ↵Alan Viverette2015-06-245-20/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | | | | | Update local state when creating LayerDrawable from constant stateAlan Viverette2015-06-245-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clears DrawableContainer's futures list when it's no longer needed, correctly sets deep copy of state set in StateListDrawable, makes some private methods into package-protected to avoid thunk, and propagates state to StateListDrawable's super class so that getState() has correct information. Bug: 21840003 Change-Id: I0d4232807f280d663c03b4a80e4aab8626806440
* | | | | | | | | | | | | | | | | | Rename and add carrier config keys for volte and ims.Junda Liu2015-06-243-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: b/21878236 Change-Id: I2bc36664969fce9e773ce8a53d56b92936d96971
generated by cgit v1.1 at 2025-03-14 21:46:36 +0000