drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,364 Commits 1 Branch 0 Tags
Commit Graph

28076 Commits

Author SHA1 Message Date
Dianne Hackborn
2af6ec5198 am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 
* commit 'c14cbac4a3e76d924621b34367cc8b6bcf977908':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
 2015-08-20 02:03:31 +00:00
Dianne Hackborn
c14cbac4a3 Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 2015-08-20 01:56:02 +00:00
Dianne Hackborn
cf836079cd Fix issue #23361510: Increase assist timeout from 500ms to 1 second 
Actually, timeout is okay, but need to schedule it on UI thread.

Change-Id: I5b4ffa7caa33815a5223e3ddd08d4809bc7cf7b6
 2015-08-19 18:54:38 -07:00
Lorenzo Colitti
0257c82fa1 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:54:48 +00: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
Amith Yamasani
e1df482c17 am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'e3de6c5df5a94e627c5ee0f188cbb066233a3dd0':
  Fix crashes when removing work profile
 2015-08-19 20:19:28 +00:00
Amith Yamasani
e3de6c5df5 Merge "Fix crashes when removing work profile" into mnc-dev 2015-08-19 20:10:30 +00:00
Dianne Hackborn
5c577bab3b am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:31:20 +00:00
Zhentao Sun
f2f0114848 Merge "Launched camera in the correct user." into mnc-dr-dev 2015-08-19 16:12:25 +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
Adam Lesinski
bda9b324c8 am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
  Change default cellular activity timeout to 10
 2015-08-19 00:53:35 +00:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats 
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
 2015-08-18 17:33:00 -07:00
Zhentao Sun
4354a05f85 Launched camera in the correct user. 
Fixed b/23325974.
The camera was always launched in the device owner's profile. Now it can
work with secondary users.

Change-Id: I826b341a7e73a9dd603dd5df7aa31bfaf4d440c4
 2015-08-18 17:05:37 -07:00
Amith Yamasani
236b2b5d28 Fix crashes when removing work profile 
This isn't specific to work profile. When multiple user
deletions happen in sequence, a race causes a dying user
to lose permissions prematurely. This fix delays removal of
user state until the user is completely cleaned up and all the
processes have been killed.

Bug: 23178833
Change-Id: I1636bc2022416359a25f19a3f65d113c05289cd3
 2015-08-18 16:48:55 -07:00
Jim Miller
bea9d7b94c Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 2015-08-18 23:12:18 +00:00
Adam Lesinski
886e7a63b1 Merge "Change default cellular activity timeout to 10" into mnc-dev 2015-08-18 20:43:34 +00:00
Jim Miller
33a5c80773 resolved conflicts for merge of 448216e7 to mnc-dr-dev 
Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5
 2015-08-18 13:07:25 -07:00
Jim Miller
e0507bbbf9 Reset fingerprint lockout timer when strong auth is used. 
Fixes bug 22565462

Change-Id: I4842877839845e7fe103396d8ca8104928568c04
 2015-08-18 13:01:31 -07:00
Tim Kilbourn
2ad9449969 Merge "Use init to write usb typec props." into mnc-dr-dev 2015-08-18 19:54:46 +00:00
Jim Miller
448216e7b8 Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev 2015-08-18 19:32:01 +00:00
Adam Lesinski
ed6160d299 Change default cellular activity timeout to 10 
LTE radios take 10 seconds to power down, so we should set the
activity timeout to 10 seconds.

Bug:23294704
Change-Id: I7478b77f134b0fe2d82e39acd5c370add12735ca
 2015-08-18 11:47:07 -07:00
Dianne Hackborn
4439dcdc39 am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
* commit 'af75c17bca8b2f017e254131393cd72e2fe7c6e8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
 2015-08-18 18:33:25 +00:00
Dianne Hackborn
af75c17bca Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a
 2015-08-18 11:08:10 -07:00
Filip Gruszczynski
eb2f302d11 am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev 
* commit '610008c0ebf5ea4556b4825eac521b2b16f1a66c':
  Clear old clip rect when creating new surface.
 2015-08-18 02:12:47 +00:00
Filip Gruszczynski
610008c0eb Merge "Clear old clip rect when creating new surface." into mnc-dev 2015-08-18 02:04:57 +00:00
Dianne Hackborn
6da89844d4 am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev 
* commit '12b9c2d6aa77d25848f81d84e34367a46d09d2af':
  Fix issue #23214751: Get a GPS fix before going in to doze
 2015-08-18 01:26:10 +00:00
Dianne Hackborn
12b9c2d6aa Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev 2015-08-18 01:17:00 +00:00
Chris Tate
b16cd62c67 am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev 
* commit 'c0a2254e083f7d2f38052012363cd71d1a6657dc':
  Clean up properly if outcall for doRestoreFinished() fails
 2015-08-18 01:13:24 +00:00
Chris Tate
c0a2254e08 Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev 2015-08-18 01:07:50 +00:00
Filip Gruszczynski
3fcb5d66e4 Clear old clip rect when creating new surface. 
This fixes an issue where a window state animator holds on to old clip
rect from previous transition and applies it to the newly created surface.

Bug: 22851074
Change-Id: Ic416a2a0c5d0f69fc80d5656541256ade41c9c36
 2015-08-17 17:52:24 -07:00
Jim Miller
deb050706c Revert "Disable fingerprint when remotely reset by DPM" 
This reverts commit 8ae1be120806d0189f65a492004a7b5416aa6c6f.

Fixes bug 23187090

Change-Id: Idd9798895b08618f7d272b818818a45d3c9dc7d2
 2015-08-17 23:33:39 +00:00
Dianne Hackborn
42df4fbe10 Fix issue #23214751: Get a GPS fix before going in to doze 
This introduces a new phase of device idle mode, immediately
before going idle (once we are sure the device is not moving),
try to collect a location for the device so that any later
requests for it will have a good chance of having an accurate
value.

We do this with two location requests: one a single-shot as
accurate as possible location, and a second longer-running
attempt to get an accurate location from the GPS.  There is
a limit on how long we will try to collect the location (default
is 30 seconds), and we stop collection once we reach a desired
accuracy (default is 20 meters).

Also cleanup various transition paths out of the normal state
flow to clean up any active state we may have running.

Change-Id: Ibd3d2e9a720fbfd9640755baf5547180dd409f6a
 2015-08-17 16:32:54 -07:00
Selim Cinek
d4d61826d0 Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev 2015-08-17 22:34:40 +00:00
Selim Cinek
d9d530216f Not allowing empty fingerprint names anymore 
Bug: 22497103
Change-Id: I638b1db5b614f5ea9bf8e3566bf4619a3249d391
 2015-08-17 12:20:00 -07:00
Christopher Tate
d71d7c350c Clean up properly if outcall for doRestoreFinished() fails 
The target app crashed at an inopportune time but this shouldn't
invalidate the whole ongoing restore operation; it's a problem local to
the specific app undergoing restore.  Recognize this, clean up the app's
possibly-incomplete data, and continue running the restore queue as
planned.

Bug 23228982

Change-Id: If9a19d2fe6a0ce5339c893630d7a61a5a5ccd9b1
 2015-08-17 12:16:19 -07:00
Junda Liu
150123a374 am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev 
* commit 'f2cb6f7e3ea143ba4acace0821c9d49e363da7eb':
  Grant SMS carrier provisioning app the permission to receive SMS.
 2015-08-17 19:03:58 +00:00
Junda Liu
f2cb6f7e3e Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev 2015-08-17 18:58:19 +00:00
Chris Tate
1a31af15c1 am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev 
* commit 'a3fd27adcc655dd9566d72f290ac343704e8e4db':
  Check component permissions like 'exported' before assigned permissions
 2015-08-17 18:55:24 +00:00
Christopher Tate
ff7add011a Check component permissions like 'exported' before assigned permissions 
In particular, don't assume that the absence of an explicit permission
requirement means that the activity is freely launchable unless you have
also checked thing like exported="true" first.

Bug 23223804

Change-Id: Idbfd1f5662b374a7a447b738591b267a1c497e41
 2015-08-17 10:25:27 -07:00
Chris Wren
877c22579e Merge "instrument fingerprint service" into mnc-dr-dev 2015-08-17 16:47:55 +00:00
Jason Monk
8cfbae048d Merge "Show usb charging notification when in host mode" into mnc-dr-dev 2015-08-17 15:29:11 +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
Junda Liu
d878f53277 Grant SMS carrier provisioning app the permission to receive SMS. 
Bug: b/22982966
Change-Id: I4af525532e2f97973ba255bf8dbb002e42997eea
 2015-08-14 17:24:43 -07:00
Tim Kilbourn
6ea47a3542 Use init to write usb typec props. 
The sysfs nodes are owned by root, so we must use init to write to
them.

Bug: 21615151
Change-Id: Ia8c838827ff45794aa359443117ac85764cf3772
 2015-08-14 17:03:34 -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
Chris Wren
c510ad56a8 instrument fingerprint service 
auth and enroll actions
  dumpsys for enrollment statistics

Bug: 22951001
Change-Id: Id472789756df110fb8b02f542440c8112e0d2a44
 2015-08-14 15:43:15 -04:00
Julia Reynolds
ac5f962898 am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev 
* commit '7df411d0cced4a849bcdca58fa3c27eb731e0862':
  Clear calling identity before getting the current user.
 2015-08-14 19:22:04 +00:00
Julia Reynolds
7df411d0cc Merge "Clear calling identity before getting the current user." into mnc-dev 2015-08-14 19:17:31 +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
Dianne Hackborn
9e398eb514 am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev 
* commit '81f3a85aa29d83ed1a5de4de1006587d375a1c77':
  Fix issue #22940169: "pm grant" can no longer grant permissions...
 2015-08-14 17:15:33 +00:00