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

198585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
d08fb6878f am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup 
* commit 'e5783e58db79f342ae0e264dc9c902cca92fc7bb':
  Fix a race condition that could cause lockup
 2015-07-24 03:08:37 +00:00
Amith Yamasani
448af8855e am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev 
* commit '5a18b4bfe2cf30df2e18047c155fecc6433ed52c':
  Avoid a deadlock between PMS and AppOpsService
 2015-07-24 03:08:30 +00:00
Alex Klyubin
bb3202995a am 155d41a0: am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev 
* commit '155d41a0f29ebe895f32d9c42e47e56acf0be59c':
  Document what algorithms Android Keystore supports.
 2015-07-24 03:08:21 +00:00
Junda Liu
e77b00cef3 am e1ebca6c: am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev 
* commit 'e1ebca6c1ecbec72e89b9f621592de41cb184d7e':
  Remove volte_feature_disabled as carrier config handled it.
 2015-07-24 03:08:16 +00:00
Jean-Michel Trivi
2ea3687786 am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev 
* commit '09c4eaf71e6ec750db5b7d810bfa9643196ed968':
  RingtoneManager: query results depend on caller permission
 2015-07-24 03:08:09 +00:00
Jack Yu
e0dc239420 am 8ac962a7: am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev 
* commit '8ac962a778f64bdd07e938d4e993f48615d3bc9e':
  Allow carriers to force disable ETWS/CMAS test messages.
 2015-07-24 03:07:57 +00:00
Geoff Mendal
c5246d9fef am 22a824fe: (-s ours) am 13edc160: (-s ours) Import translations. DO NOT MERGE 
* commit '22a824fe4f4c7a1a1de26b0d0f7650ca06d5217f':
  Import translations. DO NOT MERGE
 2015-07-24 03:07:51 +00:00
Nick Kralevich
a8937f13f8 am a2adb4c5: am 06b93a48: Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev 
* commit 'a2adb4c5441a541581db64d8f027b65033241111':
  Revert "UsbDeviceManager: fix b/21429947 regression"
 2015-07-24 03:07:45 +00:00
Svetoslav Ganov
675ecc43d6 am 5974a7ea: am 492fc648: Merge "Grant record audio to system reco service by default" into mnc-dev 
* commit '5974a7ea2fcc11b994599bdd2c9e2b4c8bbdaf56':
  Grant record audio to system reco service by default
 2015-07-24 03:07:39 +00:00
Adam Lesinski
f86fb1a4cb am 7d8d2865: am f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev 
* commit '7d8d2865a639db969d532d89c25bb50ee8d94ef7':
  UsageStats: Reduce log spam during time change
 2015-07-24 03:07:29 +00:00
Dianne Hackborn
86f88bc460 am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 
* commit 'b572b950ad7b58463ad9193f79ceed7d2c2e4be5':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
 2015-07-24 03:07:23 +00:00
Adrian Roos
06913a539b am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev 
* commit 'a9777e47848c7664472719086eb2696b7fbab8a9':
  Fix cut off charging indication in certain scripts
 2015-07-24 03:07:16 +00:00
Dianne Hackborn
47fefc5c31 am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 
* commit 'a45fc6e2ae855756ce71c9021c677cc06422de5a':
  Fix issue #22653116: Google App crashing on NYT app
 2015-07-24 03:07:11 +00:00
Svetoslav Ganov
059841e213 am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev 
* commit '586116a59ea09ec40e31a0972b629caac6348549':
  Do not show normal permissions in sideloading UI
 2015-07-24 03:07:03 +00:00
Fyodor Kupolov
bcf1c52252 am c00d2713: am a0a71d8a: Merge "Fixed a typo" into mnc-dev 
* commit 'c00d2713b9ca072ad9809303c26ae54300b1f8bd':
  Fixed a typo
 2015-07-24 03:06:55 +00:00
Adam Lesinski
e63d3144da am a403d5cc: am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev 
* commit 'a403d5ccfb4a6e455c794ad73a5fa242883e244f':
  UsageStats: Gracefully handle corrupt filenames
 2015-07-24 03:06:51 +00:00
Adrian Roos
81c6a311fd am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev 
* commit '6857305f9112b62527f1432f88812f9149492a62':
  Protect demo mode commands with permission
 2015-07-24 03:06:45 +00:00
Jae Seo
8d121cf322 am d8162e47: am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 
* commit 'd8162e47a3a099961c2eb9fd5310de55c2e8a466':
  TIF: Enable hardware acceleration on overlay
 2015-07-24 03:06:40 +00:00
Svetoslav Ganov
af27474fd5 am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev 
* commit 'cc3c6dbf1e2f33f085c0b885df9653f54337bef6':
  Add a privileged permission to get user accounts
 2015-07-24 03:06:32 +00:00
John Reck
8fb2a4fae5 am 3328fe58: am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev 
* commit '3328fe58a156f4b5452418f29f46e2d67dbcbd82':
  Fix ATLAS_MAP_ENTRY_FIELD_COUNT
 2015-07-24 03:06:27 +00:00
Adam Lesinski
898e3dda94 am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '92638a0ca9c7c2125c624e457e79088b9892d4e0':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 03:06:22 +00:00
Nick Kralevich
e4f10de7d2 am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev 
* commit 'dd856a3f0df6e076b815ae208f000e28de235353':
  UsbDeviceManager: fix b/21429947 regression
 2015-07-24 03:06:14 +00:00
Chris Wren
b86df334f7 am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit 'e6deaca693c530f7cc3298efc2c53849b9e6cd01':
  Don't crash sysui when advisory calls fail.
 2015-07-24 03:06:09 +00:00
Tim Kilbourn
cd03be66e8 am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev 
* commit 'ad49498e91883099ffda2155e96ebaf495ba579a':
  Miss USB device Interface from UsbManager.getDeviceList().
 2015-07-24 03:06:04 +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
xin He
4a4e06477b am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev 
* commit '13bb68122fae6cded11e576c41a81cd2baffb3f7':
  Angler Should Not Use Channel 11 for SoftAP
 2015-07-24 03:05:47 +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
Jorim Jaggi
a0d142d942 am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped 
* commit '5091ca9c825c32336ce42d7b70eef323ddb9cb3c':
  Partially fix that beginning of animation is skipped
 2015-07-24 03:05:28 +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
Zhentao Sun
f26a9a20ae am c6cd1f9a: Added service that listens for gestures. 
* commit 'c6cd1f9a83b2807ef7434b6775a07e1e9208d4e0':
  Added service that listens for gestures.
 2015-07-23 19:21:29 +00:00
Adrian Roos
2237c32fe1 am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:21:24 +00:00
Fred Chung
a201140bb4 am 9478ddfa: am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit '9478ddfa11a2f16e3234d4c6251fffa0d8527936':
  Doc change: add note about not exiting on onPause().
 2015-07-23 19:21:19 +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
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
John Reck
e5783e58db am 2abf0f24: Fix a race condition that could cause lockup 
* commit '2abf0f24af60b8644d5b61eed9666793083546ee':
  Fix a race condition that could cause lockup
 2015-07-23 19:20:47 +00:00
Amith Yamasani
5a18b4bfe2 am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev 
* commit 'b3e407609f567884f9322e7b34461baa14e3f3ae':
  Avoid a deadlock between PMS and AppOpsService
 2015-07-23 19:20:41 +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
Alex Klyubin
155d41a0f2 am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev 
* commit '304b01c2493f16c2537563b3e00e4770765942a2':
  Document what algorithms Android Keystore supports.
 2015-07-23 19:20:32 +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
Junda Liu
e1ebca6c1e am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev 
* commit '859551f7c0acdc8fa9f9d5ffaf0efc69441d5e47':
  Remove volte_feature_disabled as carrier config handled it.
 2015-07-23 19:20:27 +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
Jean-Michel Trivi
09c4eaf71e am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev 
* commit '7f9e9012f4bbcdd880e16212be9d90b50607c74d':
  RingtoneManager: query results depend on caller permission
 2015-07-23 19:20:22 +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