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

199301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
33a5c80773 resolved conflicts for merge of 448216e7 to mnc-dr-dev 
Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5
 2015-08-18 13:07:25 -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
Roozbeh Pournader
579283647e am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev 
* commit '53c38c8819e2497f8272e7615d34aaa4ae052adf':
  Revert "Create a special CONSTRAINED font bucket in frameworks."
 2015-08-18 19:37:16 +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
Roozbeh Pournader
53c38c8819 Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev 2015-08-18 19:29:47 +00:00
Roozbeh Pournader
bbf0c88e6c Revert "Create a special CONSTRAINED font bucket in frameworks." 
This reverts commit 9e21eced5efacd605036be599d96974964deb09b.

Bug: 22929087
 2015-08-18 12:17:13 -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
Sebastien Hertz
e9de1b4cef am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev 
* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
  Allow debugging only for apps forked from zygote
 2015-08-18 07:50:06 +00:00
Sebastien Hertz
9a010d0a41 Merge "Allow debugging only for apps forked from zygote" into mnc-dev 2015-08-18 07:41:50 +00:00
Joe Fernandez
d294dc437d am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev 
* commit '96695d2f5961cbfac2d5c5ea6a7c03612991d5fb':
  docs: App link doc update for M Preview 3
 2015-08-18 07:28:31 +00:00
Joe Fernandez
96695d2f59 Merge "docs: App link doc update for M Preview 3" into mnc-dev 2015-08-18 07:23:35 +00:00
Joe Fernandez
94fc625cf1 docs: App link doc update for M Preview 3 
Change-Id: I9a8843bb2209f9ac12d5d0946dda1e3bdd6f1947
 2015-08-18 00:14:14 -07:00
David Friedman
5f89ce649c am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev 
* commit '3e40a27eaca9e82398f7dc59006c14e56de7cc43':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs
 2015-08-18 04:54:58 +00:00
David Friedman
3e40a27eac Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into mnc-dev 2015-08-18 04:50:23 +00: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
David Friedman
eaabddf121 Docs: Fixing files that didn't merge properly from mnc-preview-docs 
Change-Id: If1a97d8da5a8e7f65293bc34e1a1646f06a48043
 2015-08-17 18:45:36 -07: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
Quddus Chong
0c61fe7606 am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 
* commit '7aa6fc67d7c1c02cd2e99e8d94b4c0b8918c4d3f':
  docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
 2015-08-17 23:48:02 +00:00
Joe Fernandez
0805fcc311 am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev 
* commit '036895e1f18539d49496ea38592d0b1f9456efd1':
  docs: M Preview 3 post-release cleanup
 2015-08-17 23:40:15 +00:00
Quddus Chong
7aa6fc67d7 Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 2015-08-17 23:38:56 +00: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
Joe Fernandez
036895e1f1 Merge "docs: M Preview 3 post-release cleanup" into mnc-dev 2015-08-17 23:30:07 +00:00
Amit Mahajan
ebadc46132 am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev 
* commit 'dd8df0418ee4a873efd66ada577c5a2b21b3de5d':
  Setting config_use_sim_language_file to false for 334-020.
 2015-08-17 23:21:25 +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
Joe Fernandez
c45bd6930b docs: M Preview 3 post-release cleanup 
- Add BTLE and Wi-Fi scan permissions change
- Add link to Support library v23 differences report
- Added known issue about Work Profiles not working in MPA44G images

Change-Id: Ica5643b1f9b6980520fd2650dcbab5d88d264127
 2015-08-17 15:39:35 -07:00
Selim Cinek
d4d61826d0 Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev 2015-08-17 22:34:40 +00:00
Jorim Jaggi
581fd0fb2e am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit '757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e':
  Fix documentation issue
 2015-08-17 21:58:51 +00:00
Jorim Jaggi
757e2c7f3e Merge "Fix documentation issue" into mnc-dev 2015-08-17 21:51:47 +00:00
Quddus Chong
db87d7cd9e docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery. 
Change-Id: I872bbb5069418a4dfb174dda5dd9e86b833f7894
 2015-08-17 14:28:32 -07:00
Joe Fernandez
1eb1f7cf9b am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev 
* commit '46ae218b2aeab9e92d59b3d074cc43d696be11d5':
  docs: Support Library v23 updates
 2015-08-17 20:27:41 +00:00
Joe Fernandez
46ae218b2a Merge "docs: Support Library v23 updates" into mnc-dev 2015-08-17 20:22:15 +00:00
Rich Slogar
f0a340e0fe docs: Support Library v23 updates 
Change-Id: I0f5b6109d907e9bb29bd500eb852a031f8952287
 2015-08-17 13:21:00 -07:00
Dirk Dougherty
ed257d1a3c am bd58d6fc: Doc change: misc fixes for preview 3. 
* commit 'bd58d6fcadad111cee35778a4f77c4f789a0f8c6':
  Doc change: misc fixes for preview 3.
 2015-08-17 19:56:28 +00:00
Dirk Dougherty
bd58d6fcad Doc change: misc fixes for preview 3. 
Change-Id: Ib389f3db0e38f13d2634fda9e893c1dd87dcd6fc
 2015-08-17 12:27:34 -07: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
Quddus Chong
aefae50d5e am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview. 
* commit 'a03567bfe0b2f71263e5facd0edc908bf43965cc':
  docs: Fixed unclosed anchor tag for M Program Overview.
 2015-08-17 18:47:52 +00:00
Jorim Jaggi
9b70f44b2a Fix documentation issue 
Bug: 23038621
Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1
 2015-08-17 18:45:22 +00:00
Chris Tate
a3fd27adcc Merge "Check component permissions like 'exported' before assigned permissions" into mnc-dev 2015-08-17 18:01:15 +00:00
Quddus Chong
a03567bfe0 docs: Fixed unclosed anchor tag for M Program Overview. 
Change-Id: I632e999c0d32acbf5c5fce5377603069fea312f0
 2015-08-17 10:53:10 -07:00