Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208,534 Commits 3 Branches 0 Tags
1b4acc8389cc2facda64c559e262beeb47c88c8d
Commit Graph

56021 Commits

Author SHA1 Message Date
Alan Viverette
1b4acc8389 am 444883e9: am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit '444883e9a1b7c38f11d631601a857da78f0b9bfa':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-24 05:10:58 +00:00
Fyodor Kupolov
21574a240b am aa32a0b5: am 5192e4b2: am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit 'aa32a0b5c6f87fe92ef0b1980b86e3612400db54':
  Added a note about location permission
 2015-07-24 05:10:41 +00:00
Jeff Sharkey
5b98249e67 am 5080e90a: am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit '5080e90a62445f3ddf2dcff4adabe2d251d25932':
  More info to support CTS, fix reconcile bug.
 2015-07-24 05:10:15 +00:00
Jason Monk
180dff0bae am bb8b0368: am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'bb8b0368c5b4ddf5cbf3cb5c0c9bbe9027bc617b':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 05:10:01 +00:00
Dianne Hackborn
96cc2b3050 am 1d8b0a29: am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '1d8b0a29ab369cac21d9f3a643244dc8c6dec0c8':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 05:09:39 +00:00
Alan Viverette
444883e9a1 am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit '35b1674a24354421701856a9c7b89abb008c911f':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-24 04:02:04 +00:00
Fyodor Kupolov
aa32a0b5c6 am 5192e4b2: am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '5192e4b2c05bb684454c5cc0fc8c80c2e7c72f08':
  Added a note about location permission
 2015-07-24 04:01:58 +00:00
Jeff Sharkey
5080e90a62 am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'aebcf3b7efadca1fb5eedbf2cf9f0895d93ba8e8':
  More info to support CTS, fix reconcile bug.
 2015-07-24 04:01:46 +00:00
Jason Monk
bb8b0368c5 am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'dea13a962356e54881c3924fc07c1aed97a97f46':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 04:01:38 +00:00
Dianne Hackborn
1d8b0a29ab am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '14aca8e87a3dc6e8fa783b3c45718a81f9f5e67a':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 04:01:24 +00:00
Alan Viverette
9b4917a6f8 am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit 'be01800d76ac786a4617e1cecac71c297acf23e4':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-24 03:05:58 +00:00
Fyodor Kupolov
030f273550 am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '2a37b2fff27c67454a59048c286b2a7e6329eb07':
  Added a note about location permission
 2015-07-24 03:05:53 +00:00
Jeff Sharkey
23fdb6355e am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'e87dc6dba58e55c60f387a86468a57a5109a97ac':
  More info to support CTS, fix reconcile bug.
 2015-07-24 03:05:42 +00:00
Jason Monk
c063146fb2 am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit '72548325019cc168a5d98fe7de93dc9ee679a4b7':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 03:05:33 +00:00
Dianne Hackborn
63ff4a77f3 am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '419f2177c8565f80489d00463aea630568251f4d':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 03:05:22 +00:00
Tor Norbye
8a9f54932e Merge "Allow @RequiresPermission to be specified on parameters" 2015-07-23 22:39:14 +00:00
Dianne Hackborn
bf822d39a2 am c9e454a5: am 26b2453c: am d363399b: am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'c9e454a544233b6d4d7ae96d4442505bbad22fcb':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 22:07:41 +00:00
Alex Klyubin
f93f1f3617 am 05984f76: am 3ad84795: am b1d68c90: am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit '05984f7627f4aa5a7c12ef33f9895ad16fcb5de1':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 22:07:33 +00:00
George Mount
b8eb74989e am d2546854: am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit 'd254685497e95ba0f921ed3a4e69636008c7e129':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 22:06:38 +00:00
Jorim Jaggi
ffbc117229 am f30c5f56: am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'f30c5f56187fed6452d557a44df8b63d8eb130a2':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 22:06:29 +00:00
Dianne Hackborn
c9e454a544 am 26b2453c: am d363399b: am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit '26b2453ca48b23177b8d692e3b1f9529a869211c':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 21:49:50 +00:00
Alex Klyubin
05984f7627 am 3ad84795: am b1d68c90: am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit '3ad847959e916c68d879d0cb127350ce524ec0a2':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 21:49:42 +00:00
George Mount
d254685497 am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '44543451206a107934c9c74ed5a53d43d73070e8':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 21:48:55 +00:00
Jorim Jaggi
f30c5f5618 am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 21:48:48 +00:00
Dianne Hackborn
d363399b97 am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit '863504111546fb46fcb5af356efb267c8582018a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-23 19:21:14 +00:00
Alex Klyubin
b1d68c90f0 am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit '568e67a322deb027480fb85e6d4082b78d907d57':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-23 19:21:07 +00:00
George Mount
c2c3eacb4c am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '27fbd360a8256cf6321da9ba29bab02b3d241aba':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 19:20:32 +00:00
Jorim Jaggi
fba926118e am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fcf9acb95a536f939a418529f642e60f51f5886a':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:20:27 +00:00
Alan Viverette
be01800d76 am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 
* commit '9478bf0e6f9618b8a5b844deaf548fc5ad1ff024':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
 2015-07-23 19:18:42 +00:00
Fyodor Kupolov
2a37b2fff2 am 5ef70b02: Merge "Added a note about location permission" into mnc-dev 
* commit '5ef70b02ead0a1e164370fefaff27bfd1ce0d492':
  Added a note about location permission
 2015-07-23 19:18:34 +00:00
Jeff Sharkey
e87dc6dba5 am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
  More info to support CTS, fix reconcile bug.
 2015-07-23 19:18:25 +00:00
Jason Monk
7254832501 am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit '4fc1b707442451f4a826929fc7e72967d443c73f':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-23 19:18:20 +00:00
Dianne Hackborn
419f2177c8 am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '6f64e737f046cd9ae13e260027781acfabaa4cba':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-23 19:18:10 +00:00
Tim Volodine
08a38b68e9 Merge "Revert "Invoke geolocation permissions callback with denied state by default."" 2015-07-23 17:27:27 +00:00
Tim Volodine
0bb7d2e467 Revert "Invoke geolocation permissions callback with denied state by default." 
This reverts commit 954d1333c4.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
 2015-07-23 17:16:16 +00:00
Filip Gruszczynski
0867d26270 Merge "Fix NPE when requesting outsets for detached view." 2015-07-23 16:05:48 +00:00
Tomasz Mikolajewski
3f78e175ac Add COLUMN_CAPACITY_BYTES column to DocumentsContract. 
Alternatives were considered:
- COLUMN_CAPACITY dounds more like real english sentence, but it is
  inconsistent with consistent with COLUMN_AVAILABLE_BYTES.
- COLUMN_USED_BYTES is consistent with COLUMN_AVAILABLE_BYTES but we rarely
  care about used bytes, more about total capacity. Such information is also
  rarely exposed by backends, and would have to be computed, so misleading.

BUG=None

Change-Id: Ic1ff3eb8fc9ec12cc79ee78c490f361f77cb4706
 2015-07-23 18:06:11 +09:00
Tomasz Mikolajewski
a375a99884 Add support for efficient move within a document provider. 
Currently moving files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where moving even huge files can be
instant.

This CL adds an optional moveDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
moving things. If not implemented, we would fallback to moving by
streaming.

BUG=None

Change-Id: I74d6754f96cbafa749a04ca9aebf2e0e2b64b515
 2015-07-23 16:00:05 +09:00
Tomasz Mikolajewski
74fe1816e8 Add support for efficient copy within a document provider. 
Currently copying files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where copying even huge files can be
instant.

This CL adds an optional copyDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
copying things. If not implemented, we would fallback to copying by
streaming.

BUG=None

Change-Id: I8f2b2c0c834717f07d42f8247cd1fc025e82239a
 2015-07-23 13:43:49 +09:00
Filip Gruszczynski
31d300f914 Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

This is a cherry pick that somehow didn't get through to master.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
 2015-07-22 15:46:06 -07:00
Alan Viverette
9478bf0e6f Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev 2015-07-22 20:35:40 +00:00
Fyodor Kupolov
5ef70b02ea Merge "Added a note about location permission" into mnc-dev 2015-07-22 20:27:06 +00:00
Dianne Hackborn
8635041115 am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'b73946715cb9e3ca7a2702407e34f885e92a5d9a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-22 20:24:30 +00:00
Alex Klyubin
568e67a322 am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit 'ada70be897fb7541129f1ab1f6faa94a80fca986':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-22 20:24:21 +00:00
George Mount
27fbd360a8 am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '7c482463cbea39cdbf2c3c8f481d82711cf0475b':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-22 20:23:02 +00:00
Jorim Jaggi
fcf9acb95a am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '20df62345910ad390a3bb321990987757db0831d':
  Add callback to voice interaction session for lockscreen shown
 2015-07-22 20:22:56 +00:00
Jeff Sharkey
f6e9a3ede5 Merge "More info to support CTS, fix reconcile bug." into mnc-dev 2015-07-22 19:40:44 +00:00
Alan Viverette
5b39ec8b40 Fix handling of RelativeLayout measurement using UNSPECIFIED spec 
Bug: 22613599
Change-Id: Ibdac9de1d5b53a46b29ae916e5dcc8b5c4bc9c27
 2015-07-22 15:37:14 -04:00
Jason Monk
4fc1b70744 Merge changes from topic 'TunerLoc' into mnc-dev 
* changes:
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-22 19:29:59 +00:00
Dianne Hackborn
6f64e737f0 Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 2015-07-22 19:04:00 +00:00