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

208428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
5a452cdad3 am c4597a90: am 6cd07625: am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'c4597a90f97e577afba22400f53e76eff181090c':
  Fixed issue with not finding existing activity for background user
 2015-07-23 22:07:25 +00:00
Kenny Guy
273639f7ad am e6b1e0e1: am 72be5067: am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit 'e6b1e0e1c22d57b8c3f70e780fdc672175780086':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 22:07:18 +00:00
Jason Monk
383749d97b am 85ce138d: am 1a2f8f7c: am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '85ce138d5e7555df0aa95541f09f776c28fd3860':
  Fix blank tiles on QS rotate
 2015-07-23 22:07:11 +00:00
Jason Monk
b734e4a84b am d621727d: am 76d79fb0: am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'd621727d0b785a69dda64ff6f87f52b3aea6014e':
  Fix crash in NetworkControllerImpl
 2015-07-23 22:07:04 +00:00
Jim Miller
d099d878dd am a7bc2e0a: am 8c98f386: am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit 'a7bc2e0aef1888f779011147e355e858b8e79eae':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 22:06:56 +00:00
Svetoslav Ganov
7b97b23329 am 6ae3ec45: am d14cbeab: am 8276a97f: am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '6ae3ec45352b5ef54366150f68d1c44994f52657':
  Update permission icons to final versions - framework
 2015-07-23 22:06:48 +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
Adrian Roos
5e2447b903 am aebb144b: am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'aebb144b3c2651f19109c8f70f809e6e9f1a2e49':
  Touch, wake and unlock
 2015-07-23 22:06:21 +00:00
Wale Ogunwale
c4597a90f9 am 6cd07625: am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit '6cd07625ece8a89ac01a958eb082bdb58ccfbc97':
  Fixed issue with not finding existing activity for background user
 2015-07-23 21:49:36 +00:00
Kenny Guy
e6b1e0e1c2 am 72be5067: am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '72be506795c4b7260612458c183282b9c59717ef':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 21:49:30 +00:00
Jason Monk
85ce138d5e am 1a2f8f7c: am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '1a2f8f7c117c9b2377827a73043928b9d86eb550':
  Fix blank tiles on QS rotate
 2015-07-23 21:49:22 +00:00
Jason Monk
d621727d0b am 76d79fb0: am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit '76d79fb097c2cb0731c67457f3f0cd72237c01e8':
  Fix crash in NetworkControllerImpl
 2015-07-23 21:49:13 +00:00
Jim Miller
a7bc2e0aef am 8c98f386: am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '8c98f38676d9da5df54f7819d9391beb802ce0ec':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 21:49:07 +00:00
Svetoslav Ganov
6ae3ec4535 am d14cbeab: am 8276a97f: am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit 'd14cbeabbc6fba855161f07cfe0b9abf910d6d4e':
  Update permission icons to final versions - framework
 2015-07-23 21:49:01 +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
Adrian Roos
aebb144b3c am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'e674e9500c723848e896d281fc4bf45285689170':
  Touch, wake and unlock
 2015-07-23 21:48:42 +00:00
Wale Ogunwale
6cd07625ec am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit '1aaf7d6cb9e88876879a7b8fbfc51c2c97bca82d':
  Fixed issue with not finding existing activity for background user
 2015-07-23 19:48:25 +00:00
Kenny Guy
72be506795 am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit 'af52ae07eee76f99c64ecd6346f3c6a9d4d77f20':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 19:48:19 +00:00
Jason Monk
1a2f8f7c11 am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '3260194f206e90508b01d2fc0187516c940fbd0c':
  Fix blank tiles on QS rotate
 2015-07-23 19:48:13 +00:00
Jason Monk
76d79fb097 am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'f91bc8709f95d8a69d9b95fadf9066eff6223a7d':
  Fix crash in NetworkControllerImpl
 2015-07-23 19:48:06 +00:00
Jim Miller
8c98f38676 am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '8cc0e80f06f98025b88e581025a2bec85f03cdd9':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 19:48:00 +00:00
Svetoslav Ganov
d14cbeabbc am 8276a97f: am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '8276a97fceed62cd30e9f41af1e4e96b49c619ca':
  Update permission icons to final versions - framework
 2015-07-23 19:47:54 +00:00
George Mount
4454345120 am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit 'c2c3eacb4c41d5eff0a53be1f4e6dc94d8928300':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 19:47:48 +00:00
Jorim Jaggi
93a25f77bb am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fba926118ed7d5465cb6e7b64d29153212f7cbee':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:47:40 +00:00
Adrian Roos
e674e9500c am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit '9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1':
  Touch, wake and unlock
 2015-07-23 19:47:35 +00:00
Colin Cross
353e6a1b8c am a083ef9a: am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'a083ef9a7b882a249928ed928adf6af61a525e37':
  Use build_number from file
 2015-07-23 19:25:47 +00:00
Wale Ogunwale
1aaf7d6cb9 am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'aecf9ba839d440fb89055bcb8454cf72d0afaf41':
  Fixed issue with not finding existing activity for background user
 2015-07-23 19:21:02 +00:00
Kenny Guy
af52ae07ee am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '2adcb40d2ce3706543f3e545ce93e9231b94971c':
  Support waiting for adb shell am stop-user to complete.
 2015-07-23 19:20:57 +00:00
Jason Monk
3260194f20 am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '1df7e135196ca3c8a6a51a9b741e12782afa039c':
  Fix blank tiles on QS rotate
 2015-07-23 19:20:53 +00:00
Jason Monk
f91bc8709f am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit '67091f46fa16537563a6c095a5bd044499bc2ea5':
  Fix crash in NetworkControllerImpl
 2015-07-23 19:20:48 +00:00
Jim Miller
8cc0e80f06 am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '4a31ee0a745e048a2c9c4db1444404373c1d606b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-23 19:20:41 +00:00
Svetoslav Ganov
8276a97fce am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit '010b53c029eac203c445d81ecfca01c242111365':
  Update permission icons to final versions - framework
 2015-07-23 19:20:37 +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
Adrian Roos
9fb98375e8 am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev 
* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
  Touch, wake and unlock
 2015-07-23 19:20:22 +00:00
Colin Cross
a083ef9a7b am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file
 2015-07-23 19:11:22 +00:00
Colin Cross
bbcc914b18 am 01efd7e8: Merge "Use build_number from file" 
* commit '01efd7e820edb9677491f28af999d825f21711a4':
  Use build_number from file
 2015-07-23 18:48:22 +00:00
Colin Cross
01efd7e820 Merge "Use build_number from file" 2015-07-23 18:23:06 +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 954d1333c478d4dba6c9a0536510da4fd94c0622.

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
Geoff Mendal
6ec08c8d04 Merge "Import translations. DO NOT MERGE" 2015-07-23 09:51:53 +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
4dc4cb09ce Merge "Add support for efficient move within a document provider." 2015-07-23 08:53:39 +00:00
Geoff Mendal
94b42e14ab Import translations. DO NOT MERGE 
Change-Id: I98fedc0c8bbeb169abb974d0a246fa6413a7eea5
Auto-generated-cl: translation import
 2015-07-23 00:29:38 -07: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
024fcf7e22 Merge "Add support for efficient copy within a document provider." 2015-07-23 06:07:25 +00: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