71878 Commits

Author SHA1 Message Date
Jeff Sharkey
8e2ea2a9f1 Pass underlying volume UUID to StorageVolume.
To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.

Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
2015-08-19 14:16:05 -07:00
Lorenzo Colitti
11e84bde9e Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into mnc-dev 2015-08-19 20:48:31 +00:00
Paul Jensen
aae613d961 Don't mark NetworkRequests restricted when they don't have restricted caps
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
2015-08-19 11:08:38 -04:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
2015-08-18 17:33:00 -07:00
Sebastien Hertz
9a010d0a41 Merge "Allow debugging only for apps forked from zygote" into mnc-dev 2015-08-18 07:41:50 +00:00
Amit Mahajan
dd8df0418e Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev 2015-08-17 23:06:13 +00:00
Jorim Jaggi
9b70f44b2a Fix documentation issue
Bug: 23038621
Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1
2015-08-17 18:45:22 +00:00
Esteban Talavera
5d467ac54a Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 2015-08-17 14:47:49 +00:00
Eino-Ville Talvala
1017f9862f Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 2015-08-15 00:46:15 +00:00
Eino-Ville Talvala
5717612ba9 Camera2: Add camera type to getNumberOfCameras.
Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
2015-08-14 14:52:57 -07:00
Dianne Hackborn
ae49872100 Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
...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
2015-08-14 14:08:43 -07:00
Daniel Sandler
8ad3e81701 Merge ""I tried to think of the most harmless thing."" into mnc-dev 2015-08-14 19:59:35 +00:00
Adam Lesinski
504600bb09 Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Dan Sandler
deafeedc81 "I tried to think of the most harmless thing."
Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
2015-08-14 15:25:55 -04:00
Chris Tate
7e7d79ef2f Merge "Make "Ask every time" actually work that way" into mnc-dev 2015-08-14 17:11:30 +00:00
Zoltan Szatmary-Ban
887cffea24 Remove uids with empty history from NetworkStats uid enumeration
Bug: 23018174
Change-Id: I1a482280599e0f5da18a208e727653d4bd4107ec
2015-08-14 16:21:52 +01:00
Svetoslav Ganov
b045331fcb Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 2015-08-14 15:06:16 +00:00
Adam Lesinski
621e06a64d Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
System UIDs are also run as shared GIDs, so this should not throw
an exception.

Bug:23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
2015-08-13 22:06:31 -07:00
Christopher Tate
56f0ff3c48 Make "Ask every time" actually work that way
..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
2015-08-13 18:56:05 -07:00
Jeff Sharkey
cfcf6af915 Merge "Method to show DialogFragment allowing state loss." into mnc-dev 2015-08-14 01:18:18 +00:00
Jeff Sharkey
063f850060 Method to show DialogFragment allowing state loss.
Same as show(), but allowing state loss.

Bug: 22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
2015-08-13 16:57:29 -07:00
Mike Dodd
226ae04df4 Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 2015-08-13 15:16:39 +00:00
Svet Ganov
52153f4c05 Add GTS test to ensure valid default permission grants - framework
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
2015-08-12 21:57:59 -07:00
Dianne Hackborn
ff9912d594 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:59 +00:00
Dianne Hackborn
c3f7449517 Fix issue #23116383: Include security patch level in Settings
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
2015-08-12 16:10:58 -07:00
Mike Dodd
4ec593928e Set default SMS/MMS app to com.android.messaging (new AOSP app).
b/23110861

Change-Id: Ifcdcfdea4d19875bf32ec19d245abc5e5a582b4c
2015-08-12 15:44:05 -07:00
Raph Levien
beabcb92cb Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 2015-08-12 21:00:07 +00:00
Clara Bayarri
f95ed10d9d Fix Insertion ActionMode not showing on RTL languages
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
2015-08-12 21:03:28 +01:00
Eino-Ville Talvala
242ff8a89d Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 2015-08-12 20:01:44 +00:00
Mike Dodd
ad285c169f Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev 2015-08-12 18:53:48 +00:00
Mike Dodd
719192c946 Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
This reverts commit 3a24898f5553e72589eaba3aeb5ef8f63909dd64.

Change-Id: I86de9a7fe9f72748c7ac33d9df7fd1fbd8007f7c
2015-08-12 18:48:31 +00:00
Adrian Roos
c0a4883d58 Merge "Prevent overlap of color views in landscape" into mnc-dev 2015-08-12 18:06:42 +00:00
Amit Mahajan
9fd96df640 Setting config_use_sim_language_file to false for 334-020.
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
2015-08-12 10:27:15 -07:00
Mike Dodd
7f2f96cce3 Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 2015-08-12 17:01:25 +00:00
Narayan Kamath
bf88205bef Fall back to persist.sys.language/country if locale isn't set.
This will prevent users from losing their language setting when they
take an OTA to M.

bug: 23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
2015-08-12 11:03:46 +01:00
Adrian Roos
fe836fabd9 Prevent overlap of color views in landscape
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
2015-08-11 17:36:43 -07:00
Dianne Hackborn
15f704e70a Merge "Fix issue #23122445: Add 420 density" into mnc-dev 2015-08-12 00:34:56 +00:00
Dianne Hackborn
1e9c51a00a Fix issue #23122445: Add 420 density
Change-Id: I15c113eb7e22f1d882db071c007224746f9d408f
2015-08-11 17:18:53 -07:00
Eino-Ville Talvala
72064af7e7 Camera: Fix framework bugs with DEPTH-only camera devices
Mostly due to no standard stream configurations being defined,
and for the correct overrides for DEPTH_POINT_CLOUD format.

Bug: 20537722
Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
2015-08-11 15:04:56 -07:00
Mike Dodd
3a24898f55 Set default SMS/MMS app to com.android.messaging (new AOSP app).
b/23110861

Change-Id: I5ac753264222cb617027cf13527178a7e754a80b
2015-08-11 13:14:53 -07:00
Alan Viverette
105febd2cf Merge "Don't re-wrap alert dialog context" into mnc-dev 2015-08-11 19:34:27 +00:00
Alan Viverette
93d9e26ffb Don't re-wrap alert dialog context
Bug: 23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
2015-08-11 15:02:42 -04:00
Alan Viverette
b4eb06402f Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 2015-08-11 18:24:04 +00:00
Alan Viverette
c12ec70def Avoid use-after-free race condition when rebasing theme
... 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
2015-08-11 10:26:08 -04:00
Esteban Talavera
4dbb37ae95 Merge "Update setApplicationRestrictions documentation" into mnc-dev 2015-08-11 09:40:57 +00:00
Andreas Gampe
b08c24a3e4 Frameworks/base: Disable Clang in core/jni
thread_local does not work with Clang at the moment.

Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
2015-08-11 06:18:49 +00:00
Dianne Hackborn
c7b57b1e65 Fix issue #23037899: Support for Battery Optimization permission + Dialog
New permission, new Intent action.

Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
2015-08-10 14:52:52 -07:00
Sebastien Hertz
7a09b8322c Allow debugging only for apps forked from zygote
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
2015-08-10 20:39:13 +02:00
Esteban Talavera
6b8e06495b Update setApplicationRestrictions documentation
From M we support nested Bundles in the input parameter

Bug: 23076454
Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
2015-08-10 18:04:10 +01:00
Torne (Richard Coles)
c52839277b Close ZipFiles correctly in WebViewFactory.
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
2015-08-10 16:40:50 +01:00