summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move extension checking code into FileUtils.Ben Kwa2015-04-237-184/+142
| | | | | | | | | | Move code for checking file extensions and MIME types from ExternalStorageProvider into android.os.FileUtils, so it can be used by other clients (e.g. DownloadsProvider). BUG=20157955 Change-Id: Ib16a16af723c21fb8d2912c8917dfd68653ea6fa
* Merge "Fix NPE when load() returns nulls."Craig Mautner2015-04-231-1/+1
|\
| * Fix NPE when load() returns nulls.Craig Mautner2015-04-231-1/+1
| | | | | | | | | | | | Fixes bug 20528625. Change-Id: I825c95fd212a1928a34e9ed0e20d2f7563939cbb
* | Merge "Add pre-order as a pricing type for ContentInfoExtender"Jose Lima2015-04-231-0/+7
|\ \ | |/ |/|
| * Add pre-order as a pricing type for ContentInfoExtenderJose Lima2015-04-221-0/+7
| | | | | | | | Change-Id: I137d038c82342869dd104b178f1b11ba02fed07c
* | Merge "Make sure to return network type after conversion"Robert Greenwalt2015-04-231-1/+1
|\ \
| * | Make sure to return network type after conversionSooraj Sasindran2015-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | After converting raf to type, make sure to return network type Change-Id: I7fd338717be98a055cbaed66d1b15417da27a3d8
* | | am 591ba605: am 26a8090a: cherrypick from lmp-docs docs: Listening for ↵Andrew Solovay2015-04-231-2/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d * commit '591ba605aa91fdec05ac73399ee5893da63833e8': cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
| * \ \ am 26a8090a: cherrypick from lmp-docs docs: Listening for ↵Andrew Solovay2015-04-231-2/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d * commit '26a8090a09bce05398cc52581ea4a5cf05d28d59': cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
| | * | | cherrypick from lmp-docs docs: Listening for restrictions-changedAndrew Solovay2015-04-231-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d Per bug 19848206, it turns out that APPLICATION_RESTRICTIONS_CHANGED is only sent to dynamically-declared listeners, *not* to listeners declared in the manifest. Updated doc to note this. (The code snippet already showed how to dynamically declare a listener.) See first comment for doc stage location. bug: 19848206 Change-Id: I6dc5f39dc6eed71cf2e303564ea906be3832d8a4
* | | | | Merge "Revert some unnecessary changes in handling XML read"Svet Ganov2015-04-232-6/+7
|\ \ \ \ \
| * | | | | Revert some unnecessary changes in handling XML readSvet Ganov2015-04-232-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3bbbc3159930d80e2e1f28fa9c0035ae5029d4b8
* | | | | | Merge "Position panel dynamically when expanding"Jorim Jaggi2015-04-232-3/+57
|\ \ \ \ \ \
| * | | | | | Position panel dynamically when expandingJorim Jaggi2015-04-232-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17125022 Change-Id: Ia39aa40c27958a6ba4eb183522d22bfad958fe5e
* | | | | | | Merge "Add @RequiresPermission"Tor Norbye2015-04-231-0/+104
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add @RequiresPermissionTor Norbye2015-04-201-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70f3ce003154069654df10080edea2b85ffaab6b
* | | | | | | Merge "Radio Access Family related fixes"Robert Greenwalt2015-04-231-7/+72
|\ \ \ \ \ \ \
| * | | | | | | Radio Access Family related fixesAbhishek Adappa2015-04-231-7/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Include EHRPD in the EVDO group 2. Fix mapping of CDMA network type to include EVDO 3. Add utility to get the network type from the Raf Change-Id: I35023083be4c681809c003c7ed6a31c698ea4647
* | | | | | | | Merge "Demo Mode instructions for Carrier Network Change icon"Andrew Flynn2015-04-231-32/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Demo Mode instructions for Carrier Network Change iconAndrew Flynn2015-04-231-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11392659 Change-Id: I8ca15a51d8079e83dc87bfe90d274a17cbe04c25
* | | | | | | | | Merge "Fix FloatingToolbar.show()"Abodunrinwa Toki2015-04-231-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix FloatingToolbar.show()Abodunrinwa Toki2015-04-231-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *Finer cancel animation methods so we call only the necessary ones. *Don't set the FloatingToolbarPopup content view's alpha to 0 before showing it's popup window. *FloatingToolbarPopup.dismiss() should run when toolbar is hidden. Bug: 20456876 Change-Id: I2e7ff5f2ec56af2def0976fa8e770c651daaa3a3
* | | | | | | | | | Merge "Disallow data clearing of DeviceOwner."Craig Mautner2015-04-234-7/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disallow data clearing of DeviceOwner.Craig Mautner2015-04-234-7/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are OEM provided apps that are able to clear the data of the device owner. That creates a security hole that this fixes. Fixes bug 20107015. Change-Id: I4ef313b394bd8059d19d20aa6533396305d1357d
* | | | | | | | | | | Merge "Return an empty cursor when a content provider app op is disabled"Svet Ganov2015-04-231-27/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Return an empty cursor when a content provider app op is disabledSvet Ganov2015-04-231-27/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17446599 Change-Id: Ic1790c9afbee5eec1dc28e1d53ce82288d4b4f86
* | | | | | | | | | am 1009c8de: am 92ae292e: Merge "docs: Add text to JavaDocs regarding ↵Joe Fernandez2015-04-231-2/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | browser file access vulnerability" into lmp-mr1-ub-docs * commit '1009c8de23920c4a368edf7f1e2ecde63e40ec82': docs: Add text to JavaDocs regarding browser file access vulnerability
| * | | | | | | | am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access ↵Joe Fernandez2015-04-231-2/+6
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vulnerability" into lmp-mr1-ub-docs * commit '92ae292e864287abcb1a78c117263f64b303b885': docs: Add text to JavaDocs regarding browser file access vulnerability
| | * | | | | | | Merge "docs: Add text to JavaDocs regarding browser file access ↵Joe Fernandez2015-04-231-2/+6
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vulnerability" into lmp-mr1-ub-docs
| | | * | | | | | | docs: Add text to JavaDocs regarding browser file access vulnerabilityJoe Fernandez2015-04-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/17420682 Change-Id: Ic03b51778280570be65ae933fd906b140acdf023
* | | | | | | | | | Merge "Hopefully fix issue #20297662: Statusbar clock not updating"Dianne Hackborn2015-04-231-1/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Hopefully fix issue #20297662: Statusbar clock not updatingDianne Hackborn2015-04-231-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that whenever we no longer have a pending-idle-until alarm, we get all of the pending alarms re-added. Change-Id: I7e80bc02afff22827d876ef5d4a381ebb62ec8e3
* | | | | | | | | | Merge "Add hidden class in framework for managing the default dialer settings"Yorke Lee2015-04-232-0/+180
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add hidden class in framework for managing the default dialer settingsYorke Lee2015-04-232-0/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20303635 Change-Id: I7e7318086ade9531fb85f08b8e3f1f001ee0a8d9
* | | | | | | | | | | Merge "Update strings for the copy error dialog to match the latest specs."Tomasz Mikolajewski2015-04-232-9/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update strings for the copy error dialog to match the latest specs.Tomasz Mikolajewski2015-04-232-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9adeff3e7e9435237b4b3337e4c687eec39b0335
* | | | | | | | | | | | Merge "Don't show two identical carrier names."Robert Greenwalt2015-04-231-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't show two identical carrier names.Sanket Padawe2015-04-231-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-sim device would show 2 PLMN in status bar even if they are same. Bug: 19710990 Change-Id: I07ba5cbf82d4cc99bb7be644cc1e95c525bcfb8b
* | | | | | | | | | | | | Merge "Implement retrying copying in case of an error in DocumentsUI."Tomasz Mikolajewski2015-04-234-32/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Implement retrying copying in case of an error in DocumentsUI.Tomasz Mikolajewski2015-04-234-32/+54
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ed1eb624aa30fb7e65d4d424ebd988dfc06d030
* | | | | | | | | | | | Merge "Do not create oat directory for an app in ASEC container"Fyodor Kupolov2015-04-232-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Do not create oat directory for an app in ASEC containerFyodor Kupolov2015-04-232-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently installation fails, if an app is located on SD card (inside ASEC). If an app is located inside ASEC, dexopt output should go to /data/dalvik-cache. dexopt also needs to be performed at a later stage, because the name of the oat file contains the absolute path to the dex file. Bug: 20452651 Change-Id: I4432ca7a0b0e88b705705acf42e5cae78cadf729
* | | | | | | | | | | | Merge "Maybe fix needing wifi permission to dump battery stats."Dianne Hackborn2015-04-231-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Maybe fix needing wifi permission to dump battery stats.Dianne Hackborn2015-04-221-5/+11
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I39f265bbdf1855e6e31d1b43e0e919199708aebd
* | | | | | | | | | | | Merge "Add "assist block" API."Dianne Hackborn2015-04-2310-20/+116
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add "assist block" API.Dianne Hackborn2015-04-2210-20/+116
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent assist structure traversal down the view hierarchy. Change-Id: I50ce5f8de6f2eca3cb862de8eacd6422c40a2f7c
* | | | | | | | | | | | Merge "Fixed bug with black background when exiting a wallpaper window."Wale Ogunwale2015-04-233-7/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed bug with black background when exiting a wallpaper window.Wale Ogunwale2015-04-223-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Defer hiding the wallpaper until all animations are done. We were previously hiding the wallpaper once the closing app animation is done which leads to the background of the opening app animation going black since there is nothing to show there. * Don't set the wallpaper_close_enter animation blackground to black. This will also cause the background of the opening app animation to go black once the wallpaper closing app animation is done. * Don't set task_open_enter animation blackground to black. This can cause an undesired black frame during transition if the new task is created on the home stack instead of an application stack. Bug: 17098816 Bug: 19454410 Change-Id: I0e63d72b1748d7d2424119b3176f48476293af92
* | | | | | | | | | | | | Merge "Add and remove DeviceInitializer from whitelist"Craig Mautner2015-04-231-31/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add and remove DeviceInitializer from whitelistCraig Mautner2015-04-231-31/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the DeviceInitializer to the locktask whitelist when set or when a new user is created. Remove DeviceInitializer from whitelist when user setup complete. Fixes bug 20267837. Change-Id: I8a33bceb6e6f3d0316a1227b2ed2b713f4ca3a9e
generated by cgit v1.1 at 2025-01-13 21:19:05 +0000