summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-26DO NOT MERGE : backport of backup transport whitelistandroid-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-5.1.1_r38lollipop-mr1-releaselollipop-mr1-cts-releaseChristopher Tate
Sysconfig define a whitelist of permitted backup transports Previously any apk bundled in priv-app could insert a backup transport. Reduce risk surface by giving the OEM explicit control over who is allowed to handle backup data. Bug 28406080 Backport of 494df791728f4d42d67e935c327910975993ad29 from N Change-Id: I405b49daee8c576584575c3e46877cc97632d8c6
2016-05-26Don't pass URL path and username/password to PAC scriptsPaul Jensen
The URL path could contain credentials that apps don't want exposed to a potentially malicious PAC script. Bug: 27593919 Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
2016-04-22DO NOT MERGE Fix intent filter prioritiesTodd Kennedy
Since this is a backport, there is only one rule that guards intent filter priorities: 1) Updates will NOT be granted a priority greater than the priority defined on the system image. Bug: 27450489 Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-22Kill the real/isolated uid group, not the ApplicationInfo uidChristopher Tate
This is a direct reimplementation in L of fixes applied to N in these two commits: 8dc8d37c1d7d694016f1ec2b3cea5fb723567be8 e8741d23d2dd05c4cb3fed5ee6a4040ee96a60e3 Bug 19285814 Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa Merge Conflict resolution to lmp-mr1-release for ag/941553
2016-03-25[DO NOT MERGE] Disallow guest user from changing Wifi settingsSamuel Tan
Disallow existing and newly created guest users from changing Wifi settings. BUG: 27411179 TEST: Flashed device, switched to existing guest user, and verified that Wifi settings are disabled. TEST: Flashed device, created new guest user, and verified that Wifi settings are disabled. Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3
2016-02-26NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r10android-5.1.1_r37Shreyas Basarge
am: 58048c1f17 * commit '58048c1f17d54166c6a048af2365d17dd32f4d57': NPE fix for SyncStorageEngine read authority
2016-02-26Redact Account info from getCurrentSyncsMatthew Williams
BUG:26094635 If the caller to ContentResolver#getCurrentSyncs does not hold the GET_ACCOUNTS permission, return a SyncInfo object that does not contain any Account information. Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314 (cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
2015-12-17merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-cts-5.1_r6android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34The Android Automerger
2015-12-17merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-5.1.1_r33The Android Automerger
2015-12-10DO NOT MERGE. Prevent recents from coming up when in SUWMichael Wright
Bug: 25229538 Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
2015-12-10DO NOT MERGE Ensure that the device is provisioned before showing Recents.Winson
Bug: 25476219 Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
2015-11-30Sync extras bundle comparison can throw NPEMatthew Williams
BUG: 23591205 Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c (cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)
2015-11-30[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.Tao Bao
Bug: 23629892 Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
2015-10-27Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."Zach Jang
This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61. Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
2015-10-27Delay hiding the cast icon for 3 seconds. DO NOT MERGEandroid-5.1.1_r30Dan Sandler
Ensure that the user has had a chance to see it for a few seconds after screen recording has ended. (cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695) Bug: 19121797 Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
2015-10-27DO NOT MERGE Send next alarm's show intent via PendingIntentAdrian Roos
Bug: 23909438 Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de
2015-10-27[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.Tao Bao
Bug: 23629892 Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
2015-10-22Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."android-cts-5.1_r5android-cts-5.1_r4android-5.1.1_r26Zach Jang
This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61. Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
2015-09-28DO NOT MERGE - Backport of ag/748165 to klp-devandroid-5.1.1_r25Zach Jang
Security patch level in Settings b/23946860 Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-28[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.Tao Bao
Bug: 23629892 Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
2015-09-28Don't mark NetworkRequests restricted when they don't have restricted capsPaul Jensen
Requests without NET_CAPABILITIES_INTERNET and just the default network capabilities should not be marked restricted. Without this fix apps can hit permissions exceptions if they inadvertently make requests without NET_CAPABILITIES_INTERNET. Bug:23164917 Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6 (cherry picked from commit aae613d96134245af7c55976731a49fa59e77470)
2015-09-28Fix NOT_RESTRICTED network capability and enforce it.Paul Jensen
With this change: 1. NOT_RESTRICTED should be removed from NetworkRequests that bring up special restricted carrier networks (e.g. IMS, FOTA). 2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL permission to register 3. Binding sockets to networks without NOT_RESTRICTED requires CONNECTIVITY_INTERNAL permission Bug:21637535 Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321 (cherry picked from commit 487ffe7d3d84bf65212158f7098e8a84b5b55e09)
2015-09-16Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."android-cts-5.1_r3android-5.1.1_r24Zach Jang
This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61. Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
2015-09-01[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.android-5.1.1_r20android-5.1.1_r19Tao Bao
Bug: 23629892 Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
2015-09-01DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.Michael Wright
If the given app name is too long for the permissions dialog, then it can push the warning that the application will be able to record the screen below the fold, letting the app basically set its own dialog message in a way that a user would be difficult to detect as fraudulant. Bug: 23345192 Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584
2015-09-01Allow debugging only for apps forked from zygoteSebastien Hertz
When starting the runtime from app_process, we only pass JDWP options if starting zygote. It prevents from opening a JDWP connection in non-zygote programs while Android apps (forked from zygote) remain debuggable. Bug: 23050463 (cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4) Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
2015-08-13Prevent insanely long passwords from crashing SystemUIandroid-5.1.1_r16android-5.1.1_r15android-5.1.1_r14Adrian Roos
Bug: 22214934 Change-Id: I32e238e53ac4b6dd0ae6de226b98894c495b256f
2015-08-13DO NOT MERGE: Ensure that unparcelling Region only reads the expected number ↵Leon Scroggins III
of bytes bug: 20883006 Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
2015-08-13Check that the parcel contained the expected amount of region data. DO NOT MERGELeon Scroggins III
bug:20883006 Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
2015-07-09DO NOT MERGE Change to add STK_PERMISSION for stk related commands.android-5.1.1_r9android-5.1.1_r10Amit Mahajan
Bug: 21697171 Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-07-09Prevent system uid component from running in an app processWale Ogunwale
Bug: 21669445 Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404 (cherry picked from commit 44368567f840e3469b5fd2c9399ed444b6f46ebf)
2015-07-09Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKSWale Ogunwale
* Applications must now have ...permission.REAL_GET_TASKS to be able to get process information for all applications. * Only the process information for the calling application will be returned if the app doesn't have the permission. * Privilages apps will temporarily be able to get process information for all applications if they don't have the new permission, but have deprecated ...permission.GET_TASKS. Bug: 20034603 Change-Id: I67ae9491f65d2280adb6a81593693d499714a216 (cherry picked from commit 9dbaa54f6834e013a63f18bd51ace554de811d80)
2015-07-09DO NOT MERGE Don't take flags when creating app widget config activity.Svet Ganov
bug:19618745 Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
2015-07-09Make Bitmap_createFromParcel check the color count. DO NOT MERGELeon Scroggins III
When reading from the parcel, if the number of colors is invalid, early exit. Add two more checks: setInfo must return true, and Parcel::readInplace must return non-NULL. The former ensures that the previously read values (width, height, etc) were valid, and the latter checks that the Parcel had enough data even if the number of colors was reasonable. Also use an auto-deleter to handle deletion of the SkBitmap. Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6 BUG=19666945 Change-Id: Iab0d218c41ae0c39606e333e44cda078eef32291
2015-05-28Revert "DO NOT MERGE Backport of limited jank-tracking metrics"android-cts-5.1_r2android-5.1.1_r6John Reck
This reverts commit 2614bd225f84f7a23e6b30fc6b47bede153e5f4c. Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
2015-05-13DO NOT MERGE Backport of limited jank-tracking metricsJohn Reck
Bug: 19821830 Cherry-pick of ba6adf66d3c44c0aa2fd8a224862ff1901d64300 Cherry-pick of e70c5754d01f2ab0ff47ea3eabaa88aca5ed2a36 Change-Id: Id342fa0ab345f204bec58acf45ce72f6de950cfb
2015-04-06[DO NOT MERGE] Fixed NPE when trying to animate a window without displayandroid-cts-5.1_r1android-5.1.1_r4android-5.1.1_r3android-5.1.1_r2android-5.1.1_r1Wale Ogunwale
In some cases it is possible for the AppToken.allAppWindows list to get out of sync with the list of windows known to WMS if the client doesn't call Session.remove(Window). This can lead to an NPE when the animation threads runs and the display for the window has been removed. Bug: 19972099 Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9
2015-04-06Fixing to fail ↵Junichi Monma
android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test. bug id : b/19938983 Change-Id: I7568bb9c41b90a57f2e3b89d3fa694ef692f05ac
2015-03-31AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGESvetoslav
AccessibilityNodeInfo refresh was getting the latest cached state but this is not good enough as an accessibility service can execute an action on the node and then refresh it to get the new state. bug:16954787 Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe (cherry picked from commit 5738fec00db65e0ee246475a7236e57ba3ee8d55)
2015-03-27When scanning unbundled apps, only install the expected APK treeChristopher Tate
We now make sure, when scanning post-factory app installs, that we do not accidentally activate a "leaked" or otherwise superfluous APK tree that the scan algorithm happens to encounter before the one that we expect a priori based on the persisted package-installation state. When we find such an extraneous installation we ignore it in favor of the expected one, similarly to the policy used when collecting system-bundled packages that have been updated. Even if we find an unexpected APK for the package, if the expected one turns out to be absent we fall back to the existing "we thought this app was present and now it isn't" logic. Bug 19602471 Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
2015-03-27CEC: Explicitly turn on screen for remote control passthroughJinsuk Kim
Ensures that the playback device turns on display output signal upon receiving CEC command <User Control Pressed>. Bug: 19518981 Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5 (cherry picked from commit 9b8507c52ae845c8eed9fd9952bf66538934b8fd)
2015-03-25Fix NPE if FPE service does not exist.Paul Crowley
Bug: 19846662 Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576
2015-03-25Disable more hotkeys while in setup.Jeff Brown
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK buttons. Bug: 19767816 Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
2015-03-25Write correct checksum when formatting partitionAndres Morales
OEM unlock enabled bit is not computed in the checksum, causing OEM Unlocking to be disabled after the second reboot. Bug: 19829441 Change-Id: I100bf5d3958b89323ee35b9e97b19c162209fcd7
2015-03-25Define the capability to speed up MT call audioDong Zhou
Bug: 19656525 Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
2015-03-25Avoid crashing on corrupted notifications.Dan Sandler
If a notification content view has an @id/icon or @id/right_icon, we need to make sure those ImageViews actually have a drawable inside. Bug: 19487078 Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
2015-03-25Prevent activities from being started during setup wizard.Michael Wright
Bug: 19677145 Change-Id: I1d7ca7b25077652355aa55848f973efa69d4b654
2015-03-25Move Noto Sans Tai Le to the end of the font fallback list.Roozbeh Pournader
This is to make sure the East Asian punctuation shared between CJK languages and Tai Le are rendered from the CJK fonts when no language is specified for the text, or CJK text is rendered in a non-CJK locale. Also remove the old comment about 64k glyphs limit. Bug: 19355391 Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106 (cherry picked from commit 70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)
2015-03-11MediaProjectionPermissionActivity: Fix NPE.android-5.1.0_r5John Spurlock
Avoid dismissing a null dialog. Bug: 19492919 Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf (cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
2015-03-11Avoid crashing on startup when policy forbids lockscreen camera.Dan Sandler
Bug: 19554426 Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de