Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,799 Commits 3 Branches 0 Tags
d803ef138df1172edfde527129957b00a8616dbe
Commit Graph

50403 Commits

Author SHA1 Message Date
Eino-Ville Talvala
d803ef138d am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev 
* commit '08b12dfba630659601972f0d857b6580fdae4313':
  Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
 2015-08-22 05:39:09 +00:00
Eino-Ville Talvala
08b12dfba6 Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev 2015-08-22 05:33:26 +00:00
Eino-Ville Talvala
a52995cc90 am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev 
* commit 'a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f':
  Camera: Fix depth documentation issues
 2015-08-22 00:25:37 +00:00
Eino-Ville Talvala
a7dde2e89e Merge "Camera: Fix depth documentation issues" into mnc-dev 2015-08-22 00:14:13 +00:00
Eino-Ville Talvala
315bc09715 Camera2: Legacy: Lock down surface sizes before creating EGL surfaces 
This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.

Bug: 22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
 2015-08-21 16:31:58 -07:00
Fyodor Kupolov
950297d27f am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit 'e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-21 23:12:14 +00:00
Fyodor Kupolov
e6c64508ab Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 2015-08-21 23:04:09 +00:00
Jim Miller
d8f61f201d am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
  Fix type-o in FingerprintManager documentation
 2015-08-21 22:11:10 +00:00
Jim Miller
74d9c2aad1 Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 2015-08-21 21:59:51 +00:00
Fyodor Kupolov
7d35fc3898 Fixed a typo in convertRestrictionsToBundle JavaDoc 
Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
 2015-08-21 11:25:55 -07:00
Fyodor Kupolov
8a363bb13d am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev 
* commit '1773ded84684593f459b19f3271d471b38f14f85':
  Fixed key comparison in equals method
 2015-08-20 19:56:02 +00:00
Fyodor Kupolov
1af7a83939 Fixed key comparison in equals method 
Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d
 2015-08-20 10:24:14 -07:00
Jim Miller
5f69ca3be3 Fix type-o in FingerprintManager documentation 
Fixes bug 23274133

Change-Id: I15607d0e64c0b11d36d0e0d47ea88c42101e4dde
 2015-08-20 05:06:36 +00:00
Jeff Sharkey
746aee22e8 am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:33:46 +00:00
Jeff Sharkey
f3ad1eabc1 Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 2015-08-20 01:28:30 +00:00
Eino-Ville Talvala
abf0b8b0a8 Camera: Fix depth documentation issues 
- Correct spelling of quaternion
- LENS_INTRINSIC_CALIBRATION and LENS_RADIAL_DISTORTION were not
  linkifying correctly

Bug: 23360503
Change-Id: I9c5acc0087d7115548b75ccfa1bc1eb1866557b2
 2015-08-19 16:21:15 -07:00
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
c4b6cee6c8 am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 20:55:01 +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
Tao Bao
9d995335f0 am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()." 
* commit '2e3746abc7d70dd72f60a7912cd45472f3032acb':
  Recursively delete directories in handleAftermath().
 2015-08-18 22:41:32 +00:00
Tao Bao
5065e12dbe Recursively delete directories in handleAftermath(). 
RecoverySystem.handleAftermath() is called to clean up recovery-related
files. It needs to handle non-empty directories as well such as leftover
stashes from failed OTAs.

Bug: 23199081
Change-Id: I33fb326d376d04c793ad7b5948a10e8c1c572812
 2015-08-18 13:48:17 -07:00
Jorim Jaggi
f7875f806f am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit '757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e':
  Fix documentation issue
 2015-08-17 21:58:33 +00:00
Jorim Jaggi
9b70f44b2a Fix documentation issue 
Bug: 23038621
Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1
 2015-08-17 18:45:22 +00:00
Esteban Talavera
acbb1a9634 am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '5d467ac54ab0390d6b911628d56294bb4277d2f1':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 14:54:41 +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
c964884eb7 am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-15 00:54:18 +00:00
Eino-Ville Talvala
1017f9862f Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 2015-08-15 00:46:15 +00:00
Dianne Hackborn
b774ed20ec 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-14 22:27:14 +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
Adam Lesinski
4fe0a44658 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:45:55 +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
d7a164bf3f 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:18 +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
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
03e64e4edd 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:12:06 +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
b53738f71e 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:36 +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
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
6d52d7616d 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:57:51 +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
9dc2d5cd5b 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:08:13 +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
09c62671e9 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:12:35 +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