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

208632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dianne Hackborn
b572b950ad am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 
* commit '4a368659baf8f86b522a6b2679bb2b2a9fd0a997':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
 2015-07-23 19:19:51 +00:00
Adrian Roos
a9777e4784 am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev 
* commit 'f21706440499df8076f6cd14955e09cb461baf2d':
  Fix cut off charging indication in certain scripts
 2015-07-23 19:19:47 +00:00
Dianne Hackborn
a45fc6e2ae am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 
* commit '5507bb41b0cb11fe36573d59dc4ec8ed03cf7715':
  Fix issue #22653116: Google App crashing on NYT app
 2015-07-23 19:19:43 +00:00
Svetoslav Ganov
586116a59e am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev 
* commit '41a62e111d8de8e64ffc61c176add6cc6217b960':
  Do not show normal permissions in sideloading UI
 2015-07-23 19:19:38 +00:00
Fyodor Kupolov
c00d2713b9 am a0a71d8a: Merge "Fixed a typo" into mnc-dev 
* commit 'a0a71d8a221d4f3896c7b0d3b2b87eba4e7a77f7':
  Fixed a typo
 2015-07-23 19:19:34 +00:00
Adam Lesinski
a403d5ccfb am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev 
* commit '05f5cb45997fdc8831798bb84e50854cdfab2bcb':
  UsageStats: Gracefully handle corrupt filenames
 2015-07-23 19:19:28 +00:00
Adrian Roos
6857305f91 am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev 
* commit '7748ea5fcd0fc32eeae1475e1871835a5aa39a5a':
  Protect demo mode commands with permission
 2015-07-23 19:19:23 +00:00
Jae Seo
d8162e47a3 am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 
* commit 'eec3d9e368328d6ca6942ae2fbd94711ecd7adc8':
  TIF: Enable hardware acceleration on overlay
 2015-07-23 19:19:19 +00:00
Svetoslav Ganov
cc3c6dbf1e am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev 
* commit '3d6f606031da248a3b1fd6f0f569ac33a26c0b5e':
  Add a privileged permission to get user accounts
 2015-07-23 19:19:14 +00:00
John Reck
3328fe58a1 am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev 
* commit '3f2c51084b9d9578532c8a88e7a5444eeedc86c2':
  Fix ATLAS_MAP_ENTRY_FIELD_COUNT
 2015-07-23 19:19:06 +00:00
Adam Lesinski
92638a0ca9 am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '6625047a3ba26ecc52bb2757eb7576027949e435':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-23 19:18:59 +00:00
Nick Kralevich
dd856a3f0d am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 
* commit '3b0bbd7b96568f0d0121136fcac9d4e1a5ffd237':
  UsbDeviceManager: fix b/21429947 regression
 2015-07-23 19:18:55 +00:00
Chris Wren
e6deaca693 am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit 'db2b4ba69db391c3703277ccb986524c072be5f5':
  Don't crash sysui when advisory calls fail.
 2015-07-23 19:18:50 +00:00
Tim Kilbourn
ad49498e91 am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 
* commit '1aadfc2bc46a14b6c95dc45ec11c4191cac5062d':
  Miss USB device Interface from UsbManager.getDeviceList().
 2015-07-23 19:18:46 +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
xin He
13bb68122f am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 
* commit '15a45e02c3372ad5deae0a260f782cd3e5a81d58':
  Angler Should Not Use Channel 11 for SoftAP
 2015-07-23 19:18:30 +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
Jorim Jaggi
5091ca9c82 am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit 'ac73f1efea0cb23881571e18e87ffc7f388af7ad':
  Partially fix that beginning of animation is skipped
 2015-07-23 19:18:15 +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
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
Steve McKay
3c8afe2011 Merge "Apply hirono@'s logic for disabling delete action" 2015-07-23 01:04:54 +00:00
Dianne Hackborn
4a368659ba Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 2015-07-23 00:56:19 +00:00
Adrian Roos
f217064404 Merge "Fix cut off charging indication in certain scripts" into mnc-dev 2015-07-23 00:50:55 +00:00
Ying Wang
50fb02da53 Add phony source target in the generated dependency file of aidl. 
This fixes make error when the source .aidl file is moved around but
its path relative to LOCAL_PATH doesn't change.

Bug: 22666539
Change-Id: Idf2492145e4927779d184932a09d61e4fe8ded0f
 2015-07-22 17:49:56 -07:00
Zhentao Sun
c6cd1f9a83 Added service that listens for gestures. 
Added the GestureLauncherService that listens for camera launch gesture
and starts the camera app.
OEMs need to specify the sensor type of the camera launch gesture in
their overlays.
In the future, we can add more gesture support in this service.

Change-Id: I0769e7ca71e08bd9159aacf29bdcefd316efd2f0
 2015-07-22 17:42:41 -07:00