summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-devRobin Lee2015-07-103-7/+9
|\ | | | | | | | | * commit '7ba46433aefad363a1d2e75d4a12f2886c6d0315': Match getLegacyVpn calls to changed interface
| * Merge "Match getLegacyVpn calls to changed interface" into mnc-devRobin Lee2015-07-103-7/+9
| |\
| | * Match getLegacyVpn calls to changed interfaceRobin Lee2015-07-073-7/+9
| | | | | | | | | | | | | | | | | | The userId argument is now explicit. Pre-requisite for bug 21499103 Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
* | | am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-devRubin Xu2015-07-105-278/+0
|\ \ \ | |/ / | | | | | | | | | * commit '331b9823d0a686d414f181ed406181d1d4e2aa1a': Remove unused MediaFormat activity
| * | Merge "Remove unused MediaFormat activity" into mnc-devRubin Xu2015-07-105-278/+0
| |\ \
| | * | Remove unused MediaFormat activityRubin Xu2015-07-095-278/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of cleanup of ExternalStorageFormatter. Bug: 9433509 Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
* | | | am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-devJason Monk2015-07-101-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7ab3cf944dd8c120555dada4fc490a9fe592f37e': Fix wifi not re-ordering
| * | | Merge "Fix wifi not re-ordering" into mnc-devJason Monk2015-07-101-1/+5
| |\ \ \
| | * | | Fix wifi not re-orderingJason Monk2015-07-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22361247 Change-Id: I5c25061735628682741060c8a699c0a977c4351b
* | | | | am ddd887af: Prevent crash when removing an account.Julia Reynolds2015-07-101-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ddd887afc826b82b37ca8bd43c847479c94c07aa': Prevent crash when removing an account.
| * | | | Prevent crash when removing an account.Julia Reynolds2015-07-101-0/+3
| |/ / / | | | | | | | | | | | | | | | | Bug: 21164141 Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
* | | | am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-devJulia Reynolds2015-07-0912-3/+139
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '963e3fdd05156bb11e6692222b2d08b34c7d126b': Talkback improvements for Settings screens.
| * | | Merge "Talkback improvements for Settings screens." into mnc-devJulia Reynolds2015-07-0912-3/+139
| |\ \ \
| | * | | Talkback improvements for Settings screens.Julia Reynolds2015-07-0912-3/+139
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21164141 Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
* | | | | am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into ↵Jason Monk2015-07-091-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '5c3b7c3adefe27bf0a91eba8318048b677d276eb': Don't clear data summary when loader is cancelled
| * | | | Merge "Don't clear data summary when loader is cancelled" into mnc-devJason Monk2015-07-091-2/+1
| |\ \ \ \
| | * | | | Don't clear data summary when loader is cancelledJason Monk2015-07-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep whatever summary we had before. Bug: 22351861 Change-Id: Id2088404f09dcadce1cbf2959918956844d613a7
* | | | | | am b6b85325: Merge "Fix rotation issues" into mnc-devJason Monk2015-07-091-0/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b6b85325e91a3e22dd23d67241adecc359dc0952': Fix rotation issues
| * | | | | Merge "Fix rotation issues" into mnc-devJason Monk2015-07-091-0/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix rotation issuesJason Monk2015-07-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22373905 Bug: 22311581 Change-Id: Idbed99a3fc0cc64047da151be166ee0ea4c1fb3d
* | | | | | am ee77eced: Merge "Check signature match between Cert installer and ↵Zoltan Szatmary-Ban2015-07-091-2/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings" into mnc-dev * commit 'ee77eced69fac3e6f94cbb3ce2013d8334c17c90': Check signature match between Cert installer and Settings
| * | | | | Merge "Check signature match between Cert installer and Settings" into mnc-devZoltan Szatmary-Ban2015-07-091-2/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Check signature match between Cert installer and SettingsZoltan Szatmary-Ban2015-07-091-2/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent an app masquerading as com.android.certinstaller install malicious certs. Bug: 22095968 Change-Id: Ia79f326af0f39a23b687cb08981920665669e0a1
* | | | | am 4bbe3d1f: Update all shown preferences in Settings > StorageZoltan Szatmary-Ban2015-07-091-8/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4bbe3d1fb66a99bfdf4cad8f2e77df23dccebbbd': Update all shown preferences in Settings > Storage
| * | | | Update all shown preferences in Settings > StorageZoltan Szatmary-Ban2015-07-091-8/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is achieved by iterating through the pool of StorageItemPreferences up to the index of the last shown one, instead of iterating through the preferences of the screen which may miss preferences inside other top-level preference groups. Bug: 22353561 Change-Id: I2293a7949a5becfb506d6b7965f8db2f11845756
* | | | am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-devSasha Levitskiy2015-07-081-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '93b1a5a974f723f5aa463162b1f5aa43338f8c2e': Fingerprint: Add post enroll call
| * | | Merge "Fingerprint: Add post enroll call" into mnc-devSasha Levitskiy2015-07-081-0/+2
| |\ \ \
| | * | | Fingerprint: Add post enroll callSasha Levitskiy2015-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 22007124 Change-Id: I670e101a1b7dfa77a4e45022840dfc916fe5ee0d Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | am 49983b99: Show correct text for app link domains.Tim Kilbourn2015-07-081-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '49983b991c01af0bc958eee1ddad144b7bde44ec': Show correct text for app link domains.
| * | | | Show correct text for app link domains.Tim Kilbourn2015-07-081-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user's preferences were not queried on the app listing, making it look like an app would open links even after the user disabled app links for the app. Bug: 21093152 Change-Id: I133ff229bb5e289ebec8df06924936fb3177f095
* | | | Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-devSelim Cinek2015-07-081-4/+11
|\ \ \ \
| * | | | Fixed the layout for the fingerprint renamingSelim Cinek2015-07-081-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21957061 Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
* | | | | am b493b291: Merge "Hide screenshot preference when assist is disabled" into ↵Jorim Jaggi2015-07-081-0/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit 'b493b2910190b95bba6cad0f328a0339acebef9b': Hide screenshot preference when assist is disabled
| * | | | Merge "Hide screenshot preference when assist is disabled" into mnc-devJorim Jaggi2015-07-081-0/+2
| |\ \ \ \
| | * | | | Hide screenshot preference when assist is disabledJorim Jaggi2015-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22343636 Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
* | | | | | am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-devJeff Sharkey2015-07-081-1/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '80eba76b109efa7e48eaf7aac145e05938d4405e': Move storage when formatting primary disk.
| * | | | | Merge "Move storage when formatting primary disk." into mnc-devJeff Sharkey2015-07-081-1/+28
| |\ \ \ \ \
| | * | | | | Move storage when formatting primary disk.Jeff Sharkey2015-07-071-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On devices where the primary storage is configured as a physical device, and when we adopt that device, automatically move the primary storage to be hosted on the newly created emulated volume. Bug: 20275423 Change-Id: I759e65a01b323ef3c9ffb86d0b7c8e7b4768a45c
* | | | | | | am 01ce80b5: Merge "Remove \'do not translate\' comment for string ↵Amit Mahajan2015-07-081-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'None\'." into mnc-dev * commit '01ce80b574e2404d911750c16a1ddd89c787f3ff': Remove 'do not translate' comment for string 'None'.
| * | | | | | Merge "Remove 'do not translate' comment for string 'None'." into mnc-devAmit Mahajan2015-07-081-1/+0
| |\ \ \ \ \ \
| | * | | | | | Remove 'do not translate' comment for string 'None'.Amit Mahajan2015-07-081-1/+0
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22278463 Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
* | | | | | | am c7777b94: Merge "Locale based string changes in BT." into mnc-devSanket Padawe2015-07-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c7777b947097160cd89252f1f1e27704d82c25f6': Locale based string changes in BT.
| * | | | | | Merge "Locale based string changes in BT." into mnc-devSanket Padawe2015-07-081-0/+1
| |\ \ \ \ \ \
| | * | | | | | Locale based string changes in BT.Sanket Padawe2015-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22219203 Change-Id: Ic920621baf769032475da32ea425097aafa0922e
* | | | | | | | am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into ↵Sanket Padawe2015-07-081-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit 'c9cdf9c814020c777ffec7cfceb5b38c74e091f5': Disable CA certificate for EAP-SIM, AKA & AKA'
| * | | | | | | Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-devSanket Padawe2015-07-081-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Disable CA certificate for EAP-SIM, AKA & AKA'Sanket Padawe2015-07-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21877800 Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48
* | | | | | | | am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into ↵Robin Lee2015-07-081-11/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '64e1e15d10b41f6993abf4cb77d220a05f79191a': Restore Vpn advanced options on re-init or rotate
| * | | | | | | Merge "Restore Vpn advanced options on re-init or rotate" into mnc-devRobin Lee2015-07-081-11/+28
| |\ \ \ \ \ \ \
| | * | | | | | | Restore Vpn advanced options on re-init or rotateRobin Lee2015-07-061-11/+28
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visibility isn't restored as part of instance state by default. Bug: 22183281 Change-Id: I86a7165e918251bc32f6884b9ad5f9c5987ca075
generated by cgit v1.1 at 2025-02-10 12:05:43 +0000