summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Don't mark NetworkRequests restricted when they don't have restricted ↵Lorenzo Colitti2015-08-191-1/+5
|\ | | | | | | caps" into mnc-dev
| * Don't mark NetworkRequests restricted when they don't have restricted capsPaul Jensen2015-08-191-1/+5
| | | | | | | | | | | | | | | | | | | | 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
* | Fix issue #23326715: Clarify --checkin/-c options in batterystatsDianne Hackborn2015-08-181-1/+0
|/ | | | Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
* Merge "Allow debugging only for apps forked from zygote" into mnc-devSebastien Hertz2015-08-181-6/+10
|\
| * Allow debugging only for apps forked from zygoteSebastien Hertz2015-08-101-6/+10
| | | | | | | | | | | | | | | | | | | | 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 Change-Id: If8ea719063a65db4cdeed69a838b52e87b078b08
* | Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-devAmit Mahajan2015-08-171-0/+21
|\ \
| * | Setting config_use_sim_language_file to false for 334-020.Amit Mahajan2015-08-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Logs seen with a regular customer sim indicate that language is not set correctly on this carrier's sim. This config will avoid using that language as default. Bug: 23111193 Change-Id: I831eabab3c3a6ea8bb4efe7fb1cb35a71c88b5ce
* | | Fix documentation issueJorim Jaggi2015-08-171-3/+0
| | | | | | | | | | | | | | | Bug: 23038621 Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1
* | | Merge "Remove uids with empty history from NetworkStats uid enumeration" ↵Esteban Talavera2015-08-171-6/+20
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | Remove uids with empty history from NetworkStats uid enumerationZoltan Szatmary-Ban2015-08-141-6/+20
| | | | | | | | | | | | | | | | | | | | Bug: 23018174 Change-Id: I1a482280599e0f5da18a208e727653d4bd4107ec
* | | | Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-devEino-Ville Talvala2015-08-153-2/+11
|\ \ \ \
| * | | | Camera2: Add camera type to getNumberOfCameras.Eino-Ville Talvala2015-08-143-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not list strange cameras in old API; ensure new API gets all cameras. Bug: 23194168 Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
* | | | | Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...Dianne Hackborn2015-08-143-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...from Camera360 to Hangouts } In the short URI toString, include a small summary of the ClipData (instead of just saying it has a clip data). This makes it a lot easier to understand what is happening when you look at the log of activity starts. Also separate out the activity manager dump of URI permission grants from its dump of providers, so it is easy to just look at that state. Change-Id: I68093d9f279944e1aa9a29347075f237f4f55ed3
* | | | | Merge ""I tried to think of the most harmless thing."" into mnc-devDaniel Sandler2015-08-145-25/+124
|\ \ \ \ \
| * | | | | "I tried to think of the most harmless thing."Dan Sandler2015-08-145-25/+124
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 21984798 Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
* | | | | Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into ↵Adam Lesinski2015-08-141-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDsAdam Lesinski2015-08-131-6/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System UIDs are also run as shared GIDs, so this should not throw an exception. Bug:23189342 Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
* | | | | Merge "Make "Ask every time" actually work that way" into mnc-devChris Tate2015-08-142-0/+17
|\ \ \ \ \
| * | | | | Make "Ask every time" actually work that wayChristopher Tate2015-08-132-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..in link-opening behavior. If a candidate is marked as "ask every time," then the user is guaranteed to get a disambiguation prompt including that candidate even when some other candidate app is in the "always prefer this over a browser" state. Bug 23147746 Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
* | | | | | Merge "Add GTS test to ensure valid default permission grants - framework" ↵Svetoslav Ganov2015-08-144-0/+118
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | into mnc-dev
| * | | | | Add GTS test to ensure valid default permission grants - frameworkSvet Ganov2015-08-124-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The platform grants runtime permissions by default to apps on the system image that provide core device use cases which a user expects to work out-of-the-box. We are now adding a test to ensure that OEMs cannot pregrant premissions on non approved components. bug:23043018 Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
* | | | | | Merge "Method to show DialogFragment allowing state loss." into mnc-devJeff Sharkey2015-08-141-0/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Method to show DialogFragment allowing state loss.Jeff Sharkey2015-08-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as show(), but allowing state loss. Bug: 22867250 Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
* | | | | | Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." ↵Mike Dodd2015-08-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | into mnc-dev
| * | | | | Set default SMS/MMS app to com.android.messaging (new AOSP app).Mike Dodd2015-08-121-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | b/23110861 Change-Id: Ifcdcfdea4d19875bf32ec19d245abc5e5a582b4c
* | | | | Merge "Fix issue #23116383: Include security patch level in Settings" into ↵Dianne Hackborn2015-08-131-0/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | mnc-dev
| * | | | Fix issue #23116383: Include security patch level in SettingsDianne Hackborn2015-08-121-0/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
* | | | | Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-devRaph Levien2015-08-122-3/+11
|\ \ \ \ \
| * | | | | Fix Insertion ActionMode not showing on RTL languagesClara Bayarri2015-08-122-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When long pressing on an empty Text field with the system language set to RTL, the "paste" popup was not showing up. The Floating Toolbar requires a content rect to determine where the text is and place itself close to it. In the case of an empty field, we create a "fake" content rect by taking the placement of the cursor +1 pixel to the right. In RTL languages, this +1 causes the content rect to be considered off the bounds of the view, as the cursor is aligned to the right, and hence the Floating Toolbar is hidden. After making the rect a 0 width rect, we ran into the issue that it was considered out of bounds due to the calculation ignoring rects that simply touch the edge of the view's bounds. BUG: 22540083 Change-Id: I29c79b701f586970b2611178233eff082b802ec1
* | | | | | Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-devEino-Ville Talvala2015-08-121-5/+16
|\ \ \ \ \ \
| * | | | | | Camera: Fix framework bugs with DEPTH-only camera devicesEino-Ville Talvala2015-08-111-5/+16
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly due to no standard stream configurations being defined, and for the correct overrides for DEPTH_POINT_CLOUD format. Bug: 20537722 Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
* | | | | | Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP ↵Mike Dodd2015-08-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | app)."" into mnc-dev
| * | | | | | Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."Mike Dodd2015-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3a24898f5553e72589eaba3aeb5ef8f63909dd64. Change-Id: I86de9a7fe9f72748c7ac33d9df7fd1fbd8007f7c
* | | | | | | Merge "Prevent overlap of color views in landscape" into mnc-devAdrian Roos2015-08-121-10/+22
|\ \ \ \ \ \ \
| * | | | | | | Prevent overlap of color views in landscapeAdrian Roos2015-08-111-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes overlap from the color views which resulted in subotimal looks when both color views were translucent and the nav bar was on the right edge. Also fixes a bug introduced in I2df7092a91eceeb815367ef917dd7289f4f2b27e where the navigation-bar-on-right-side case got forgotten and caused flickering in landscape when IMMERSIVE_STICKY was set but the navigation bar was visible. Bug: 22876533 Change-Id: I449a82eb3dc3f7b5051f26b37b362a196b4ff63a
* | | | | | | | Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." ↵Mike Dodd2015-08-121-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | | into mnc-dev
| * | | | | | Set default SMS/MMS app to com.android.messaging (new AOSP app).Mike Dodd2015-08-111-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | b/23110861 Change-Id: I5ac753264222cb617027cf13527178a7e754a80b
* | | | | | Fall back to persist.sys.language/country if locale isn't set.Narayan Kamath2015-08-121-27/+59
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent users from losing their language setting when they take an OTA to M. bug: 23021286 Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
* | | | | Merge "Fix issue #23122445: Add 420 density" into mnc-devDianne Hackborn2015-08-121-0/+8
|\ \ \ \ \
| * | | | | Fix issue #23122445: Add 420 densityDianne Hackborn2015-08-111-0/+8
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I15c113eb7e22f1d882db071c007224746f9d408f
* | | | | Merge "Don't re-wrap alert dialog context" into mnc-devAlan Viverette2015-08-111-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't re-wrap alert dialog contextAlan Viverette2015-08-111-1/+2
| |/ / / | | | | | | | | | | | | | | | | Bug: 23038618 Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
* | | | Merge "Avoid use-after-free race condition when rebasing theme" into mnc-devAlan Viverette2015-08-111-5/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid use-after-free race condition when rebasing themeAlan Viverette2015-08-111-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by never rebasing the theme. We don't need to do this unless the system theme is configuration-dependent, which it is not currently. Bug: 22943781 Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
* | | | Merge "Update setApplicationRestrictions documentation" into mnc-devEsteban Talavera2015-08-111-2/+7
|\ \ \ \
| * | | | Update setApplicationRestrictions documentationEsteban Talavera2015-08-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From M we support nested Bundles in the input parameter Bug: 23076454 Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
* | | | | Frameworks/base: Disable Clang in core/jniAndreas Gampe2015-08-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread_local does not work with Clang at the moment. Bug: 22414716 Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26 (cherry picked from commit 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
* | | | | Fix issue #23037899: Support for Battery Optimization permission + DialogDianne Hackborn2015-08-102-3/+36
| |_|/ / |/| | | | | | | | | | | | | | | | | | | New permission, new Intent action. Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
* | | | Close ZipFiles correctly in WebViewFactory.Torne (Richard Coles)2015-08-101-4/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | We weren't closing the ZipFiles created in WebViewFactory to check inside APKs - use try-with-resources to get them closed automatically. Bug: 23072621 Change-Id: I11c6b77e960a7d240d19d22240cac177b6ba27b2
* | | Do not show removed permissions in the UI - frameworkSvet Ganov2015-08-073-8/+14
| | | | | | | | | | | | | | | | | | bug:23043018 Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5