Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
207,244 Commits 3 Branches 0 Tags
0ce3a291fb4fdbfd041e605c0cb71dff4f681e8a
Commit Graph

55437 Commits

Author SHA1 Message Date
Dianne Hackborn
0ce3a291fb am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '914eda0070cde26325db3d2a2e9bbf0a9e612107':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 02:55:05 +00:00
Dan Sandler
d1b160f362 am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '87c1e1b8a1f6927d2c31375e83fd353110edd326':
  "I tried to think of the most harmless thing."
 2015-08-16 02:54:36 +00:00
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
Dan Sandler
415c6cb235 am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
  "I tried to think of the most harmless thing."
 2015-08-16 02:36:17 +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
Dan Sandler
8c8387d235 resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd
 2015-08-15 18:33:29 -04: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
c852a3e39c am eb694bb6: am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit 'eb694bb6e69dd382e9ed114dde604c6a0942c3c2':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 20:12:44 +00: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
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
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
14e122582c am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '13845aeae3fc3044f3fc279ca421df6d4f78ee35':
  Make "Ask every time" actually work that way
 2015-08-14 17:35:28 +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
f64014195b am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '340314fd0306f24fe8e4047b8feede071aadfb97':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:36:40 +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
Jeff Sharkey
e7ed65eb45 am 4efd3f26: am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit '4efd3f26ac515f85adde2979ec1d8d68218fc470':
  Method to show DialogFragment allowing state loss.
 2015-08-14 03:19:00 +00:00
Wei Liu
b8a1747b6d am ddd3e323: am d6fb8958: Merge "Add a setting to enable cellular on boot." into cw-e-dev 
* commit 'ddd3e323c4cefb8994dd5f2927ea9c11dbc5cfd2':
  Add a setting to enable cellular on boot.
 2015-08-14 03:18:22 +00: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
1dd2f5a3eb am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '40bc20660d3dc65f66e4409893f1ba6bf729d97f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:18:13 +00: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
d202d15d9e am cf2d44be: am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'cf2d44bee50dc2950181bbf5974c32eacea6f0a7':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:31:07 +00: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
159a16ab79 am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit 'f21ecd037e7d17626416e3247b83ab93d81d2559':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:53:52 +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
Adrian Roos
e77660d7f4 am ea73528c: am afdfc2c0: am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit 'ea73528c66fda8e70b7672a2cbac7f80ea3686f2':
  Prevent overlap of color views in landscape
 2015-08-12 18:43:02 +00:00
Adrian Roos
afdfc2c04d am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit '192ca56d7a0c8a1a776bd8f9539c49f4b8ce3372':
  Prevent overlap of color views in landscape
 2015-08-12 18:26:49 +00:00
Adrian Roos
192ca56d7a am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit 'c0a4883d58554c84d10911da20f43be149b47c53':
  Prevent overlap of color views in landscape
 2015-08-12 18:16:32 +00:00
Adrian Roos
c0a4883d58 Merge "Prevent overlap of color views in landscape" into mnc-dev 2015-08-12 18:06:42 +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