Dianne Hackborn
574f9b42da
am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo..." into mnc-dev
...
* commit 'ac11522e540422d3afc691af5510da14ab7a3d40':
Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo...
2015-08-16 02:36:58 +00:00
Dianne Hackborn
ac11522e54
am 06f552cf: Merge "Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo..." into mnc-dev
...
* commit '06f552cf9a89cd129beda8318a4832bd56d00796':
Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo...
2015-08-16 01:34:04 +00: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
Adam Lesinski
546909c990
am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
...
* commit '479c482ca1788235afc776125eb6a79f1d9281c8':
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
2015-08-14 19:56:38 +00:00
Adam Lesinski
479c482ca1
am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
...
* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
2015-08-14 19:47:54 +00:00
Adam Lesinski
504600bb09
Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
2015-08-14 19:38:34 +00:00
Chris Tate
b2d4c5507f
am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit 'b47890c4e7a7fc119e74da2b50bf94c2cf172916':
Make "Ask every time" actually work that way
2015-08-14 17:21:52 +00:00
Chris Tate
b47890c4e7
am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit '7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
Make "Ask every time" actually work that way
2015-08-14 17:15:37 +00:00
Chris Tate
7e7d79ef2f
Merge "Make "Ask every time" actually work that way" into mnc-dev
2015-08-14 17:11:30 +00:00
Svetoslav Ganov
7c3d595a3d
am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
...
* commit '4b655fd193992afff948df513c7b9b9a0389972e':
Add GTS test to ensure valid default permission grants - framework
2015-08-14 15:19:47 +00:00
Svetoslav Ganov
4b655fd193
am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
...
* commit 'b045331fcb033507072bfd7899a147bb2be7176e':
Add GTS test to ensure valid default permission grants - framework
2015-08-14 15:13:38 +00: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
d28991a5e4
am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
...
* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
Method to show DialogFragment allowing state loss.
2015-08-14 01:35:40 +00:00
Jeff Sharkey
b6f5bcd0c6
am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
...
* commit 'cfcf6af915bee878bdaea04f48592bbbe506ad26':
Method to show DialogFragment allowing state loss.
2015-08-14 01:24:44 +00: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
Wei Liu
d6fb8958d2
Merge "Add a setting to enable cellular on boot." into cw-e-dev
2015-08-13 22:35:43 +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
a54d4583ec
am 9512a857: am ff9912d5: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '9512a857454d761b53f46958733ba23216c41e64':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 01:02:26 +00:00
Dianne Hackborn
9512a85745
am ff9912d5: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 00:54:35 +00: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
Raph Levien
855a862f6d
am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'c98a786c693bf0bb617348e858ffe720db4d96d8':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:13:32 +00:00
Raph Levien
c98a786c69
am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
...
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
Fix Insertion ActionMode not showing on RTL languages
2015-08-12 21:07:43 +00:00
Raph Levien
beabcb92cb
Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
2015-08-12 21:00:07 +00:00
Eino-Ville Talvala
6986410a59
am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '5679800f382918bb3ca159997609fc551f2a739a':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:32:53 +00:00
Eino-Ville Talvala
5679800f38
am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
...
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 20:18:46 +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
Wei Liu
a181770f35
Add a setting to enable cellular on boot.
...
b/22804423
Change-Id: Ifcee3a2a8bfbfab366c3f9dcd8926d500851bd32
2015-08-12 10:02:06 -07:00
Dianne Hackborn
e92b137407
am ea5ce408: am 15f704e7: Merge "Fix issue #23122445 : Add 420 density" into mnc-dev
...
* commit 'ea5ce4080be58a8092df38a49d828e4281497dc4':
Fix issue #23122445 : Add 420 density
2015-08-12 00:44:12 +00:00
Dianne Hackborn
ea5ce4080b
am 15f704e7: Merge "Fix issue #23122445 : Add 420 density" into mnc-dev
...
* commit '15f704e70a0fc02f50f0b618b19147ca09c5e421':
Fix issue #23122445 : Add 420 density
2015-08-12 00:37:25 +00: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
Zach Johnson
6d7af4b795
Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev
2015-08-11 23:14:24 +00:00
Zach Johnson
143ebdb94e
DO NOT MERGE Allow a custom component to handle network policy notifications
...
Broadcasts information about network policy notifications
to a custom component, if specified, so it can handle them.
Also exposes an API to snooze warning notifications.
Change-Id: Ic89478fa437861e2d4b6a9443858bcaf12122fba
2015-08-11 15:36:06 -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
Alan Viverette
f3d04cbfe6
am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev
...
* commit 'bb03bf055437c21180026b8c8227c52ca2809286':
Don't re-wrap alert dialog context
2015-08-11 19:48:00 +00:00
Alan Viverette
bb03bf0554
am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev
...
* commit '105febd2cfb4760926ed0aef3c24be3727dd36e4':
Don't re-wrap alert dialog context
2015-08-11 19:41:40 +00: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
6c3a468cf3
am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
...
* commit 'e720297fd89d39325a34f0d8f54e55971aec7269':
Avoid use-after-free race condition when rebasing theme
2015-08-11 18:38:21 +00:00
Alan Viverette
e720297fd8
am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
...
* commit 'b4eb06402fba62f94bb16cbe433fe99a8df7cb18':
Avoid use-after-free race condition when rebasing theme
2015-08-11 18:31:48 +00: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
Jason Monk
c7789c3ecb
am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev
...
* commit '36052477465f51a4c690e4e8dfb290fb15ce88b0':
Add setting to disable camera gesture
2015-08-11 14:02:42 +00:00
Jason Monk
3605247746
Merge "Add setting to disable camera gesture" into mnc-dr-dev
2015-08-11 13:55:53 +00:00
Esteban Talavera
8e85fdfe46
am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev
...
* commit '467951eebbc6525b40a6b569c401849fe2394c1d':
Update setApplicationRestrictions documentation
2015-08-11 10:16:36 +00:00