208755 Commits

Author SHA1 Message Date
Tim Kilbourn
f9327433a5 am 4d2c2583: am a714a4a7: am 2f778da1: am 46638832: am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit '4d2c2583df96a85ab409b223686d9b77c64eb2a8':
  Add a wm command to dismiss the keyguard.
2015-07-24 05:15:44 +00:00
Svetoslav Ganov
5cdca2a812 am cb731204: am ce4668b6: am 3fce45b6: am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
* commit 'cb731204c47034b6ce3e6a96b127fafc322a3625':
  Reset permissions and app links when clearing app preferences - framework
2015-07-24 05:15:36 +00:00
Svetoslav Ganov
9bec9660a3 am 7ddfc7b0: am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '7ddfc7b0245d600605efc4d764378f40d6861437':
  Shut down UiAutomationConnection without a lock held
2015-07-24 05:15:29 +00:00
Tim Kilbourn
58aebfdfdc am 096b562e: am 79383d53: am 1c78d467: am 115189fd: am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
* commit '096b562ec3700fec2fa09219b2182fc34e5ba6ff':
  Properly synchronize interactivity state.
2015-07-24 05:15:22 +00:00
Jason Monk
3e946a212f am 17127a3c: am 184044e4: am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit '17127a3cb603876223949f4475bdc94a2a782b85':
  Fix emergency only when no sims
2015-07-24 05:15:15 +00:00
Julia Reynolds
a91a49bde2 am cf533d1c: am 969bc9f7: am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
* commit 'cf533d1cf75de224652e236546b4c78c89a7e1ae':
  Set 'the' media notification to the notification actually playing.
2015-07-24 05:15:07 +00:00
Jorim Jaggi
b91f0febca am 48692f6e: am dd0b42d4: am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS
* commit '48692f6e196ea0f39335509f84e43f3f414247d4':
  Make sure expandingFinished gets called when going into QS
2015-07-24 05:15:00 +00:00
Wenchao Tong
b7499dceee am 34f055ab: am 52dd36cb: am 1770cb41: am 25975f1b: am bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
* commit '34f055ab9fc9dc0e657d61175cd952577ddc4a8e':
  Ignore the active network scorer when checking for idleness
2015-07-24 05:14:52 +00:00
John Reck
9e5f4af1ed am 11f9da31: am bdb2a905: am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup
* commit '11f9da310ac3129cd859ef98f7f10d897308a59b':
  Fix a race condition that could cause lockup
2015-07-24 05:14:44 +00:00
Amith Yamasani
e8e79221bb am 63af4910: am 81b5d555: am 448af885: am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
* commit '63af49102373ac575eee2a8c30e2facbb13e1ca5':
  Avoid a deadlock between PMS and AppOpsService
2015-07-24 05:14:36 +00:00
Alex Klyubin
7ed74ce040 am aec5a14e: am 6d8cf7a7: am bb320299: am 155d41a0: am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
* commit 'aec5a14e6cc0464b157a5b098d056ed17c39a579':
  Document what algorithms Android Keystore supports.
2015-07-24 05:14:28 +00:00
Junda Liu
809f24d5c6 am 5ffab5f6: am 18046b72: am e77b00ce: am e1ebca6c: am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
* commit '5ffab5f60381ed16d1908bff72ccad08b3741f4c':
  Remove volte_feature_disabled as carrier config handled it.
2015-07-24 05:14:21 +00:00
Jean-Michel Trivi
3824cd73fd am 6045865d: am 5be1cdea: am 2ea36877: am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '6045865d0203ce89707f94f6a478666d4c98f9af':
  RingtoneManager: query results depend on caller permission
2015-07-24 05:14:07 +00:00
Jack Yu
9a06d1c567 am 1643493e: am de978817: am e0dc2394: am 8ac962a7: am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit '1643493e97c8904d3215c66bcd15985e72631e69':
  Allow carriers to force disable ETWS/CMAS test messages.
2015-07-24 05:13:59 +00:00
Geoff Mendal
13844231eb am 689ddb04: (-s ours) am 06cec5f5: (-s ours) am c5246d9f: (-s ours) am 22a824fe: (-s ours) am 13edc160: (-s ours) Import translations. DO NOT MERGE
* commit '689ddb04f6eefb7cbdff059395c4b80eb7c71852':
  Import translations. DO NOT MERGE
2015-07-24 05:13:51 +00:00
Nick Kralevich
c0121df2e0 am d9b08e61: am d517de5a: am a8937f13: am a2adb4c5: am 06b93a48: Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev
* commit 'd9b08e6131c26a0ea6646a8dd3b206f53472028d':
  Revert "UsbDeviceManager: fix b/21429947 regression"
2015-07-24 05:13:36 +00:00
Svetoslav Ganov
2138736179 am 54603af5: am d788f405: am 675ecc43: am 5974a7ea: am 492fc648: Merge "Grant record audio to system reco service by default" into mnc-dev
* commit '54603af5c2c044a3635c77f25fe0eaf6f826a4f7':
  Grant record audio to system reco service by default
2015-07-24 05:13:27 +00:00
Adam Lesinski
94131300fe am 4c3d76bc: am a3bfea87: am f86fb1a4: am 7d8d2865: am f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev
* commit '4c3d76bca8127720b3d5f8b29b36730b357454d5':
  UsageStats: Reduce log spam during time change
2015-07-24 05:13:13 +00:00
Dianne Hackborn
e3a1ea1152 am b365dff5: am bd3d9a0d: am 86f88bc4: am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
* commit 'b365dff5c23b35170f12dd034fa40f911a00b325':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
2015-07-24 05:13:06 +00:00
Adrian Roos
3a90f73fb1 am 9e80d470: am 6b32c53b: am 06913a53: am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
* commit '9e80d4703968efc47fb12fbbaadabd4df3a9b90b':
  Fix cut off charging indication in certain scripts
2015-07-24 05:12:52 +00:00
Dianne Hackborn
e8a70aa403 am 556aa7dc: am 00e9e97f: am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev
* commit '556aa7dc8c1fde7c053ef1c7cac830449eaee0d7':
  Fix issue #22653116: Google App crashing on NYT app
2015-07-24 05:12:44 +00:00
Svetoslav Ganov
a30cb27f2a am cec9ac5c: am 71fa8e19: am 059841e2: am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
* commit 'cec9ac5c8fdf0030efb0b60b1e3156bfc71a4d92':
  Do not show normal permissions in sideloading UI
2015-07-24 05:12:36 +00:00
Fyodor Kupolov
ef6890a675 am 5fe9b5d4: am 142e21b2: am bcf1c522: am c00d2713: am a0a71d8a: Merge "Fixed a typo" into mnc-dev
* commit '5fe9b5d4a8748a0978d85789e2efc8d562708926':
  Fixed a typo
2015-07-24 05:12:28 +00:00
Adam Lesinski
4fe9681cea am 438fb54a: am 91211df6: am e63d3144: am a403d5cc: am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
* commit '438fb54a2684c766617784d4072eea36b133784e':
  UsageStats: Gracefully handle corrupt filenames
2015-07-24 05:12:17 +00:00
Adrian Roos
155fe990a7 am b6527cd6: am 32e8de05: am 81c6a311: am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
* commit 'b6527cd6e85282f5fe93b0d898cc691437845e1d':
  Protect demo mode commands with permission
2015-07-24 05:12:10 +00:00
Jae Seo
3a22378dfe am c109f221: am e47e3b19: am 8d121cf3: am d8162e47: am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
* commit 'c109f2212b188aa60a75b14f4c6db3ad35d026a5':
  TIF: Enable hardware acceleration on overlay
2015-07-24 05:11:59 +00:00
Svetoslav Ganov
61fe8e0105 am 1298b1a0: am 1ad413c0: am af27474f: am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
* commit '1298b1a0a25a19559c81293ac87b31a4ffcbc973':
  Add a privileged permission to get user accounts
2015-07-24 05:11:51 +00:00
John Reck
986605a950 am 27dcd052: am e8b154a0: am 8fb2a4fa: am 3328fe58: am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
* commit '27dcd05258af06a22302316099041e0f6aeff853':
  Fix ATLAS_MAP_ENTRY_FIELD_COUNT
2015-07-24 05:11:44 +00:00
Adam Lesinski
e4e691b802 am a0d43c31: am 602d71db: am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit 'a0d43c31df8a5c1d3a52dc28a263cb2c4b1b0092':
  BatteryStats: Use English locale for dump and checkin data
2015-07-24 05:11:36 +00:00
Nick Kralevich
7bdcbd8bfc am a508d399: am 01e00c8c: am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev
* commit 'a508d399e720b3a535832ce0b2554680197944af':
  UsbDeviceManager: fix b/21429947 regression
2015-07-24 05:11:28 +00:00
Chris Wren
26ed7e6dfa am 3a66153f: am 99547e49: am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
* commit '3a66153f2a8185d0a4ca0de23c70cd81178e0eea':
  Don't crash sysui when advisory calls fail.
2015-07-24 05:11:16 +00:00
Tim Kilbourn
96f346cf14 am 865ecdb4: am d8f08d65: am cd03be66: am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
* commit '865ecdb4d2129ad8c3037caf2b9a92d52d8d3bc9':
  Miss USB device Interface from UsbManager.getDeviceList().
2015-07-24 05:11:06 +00:00
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
xin He
ebc30c04b0 am 261b6942: am b76cc910: am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
* commit '261b69429493943ee99730966701f9b483d9bcb9':
  Angler Should Not Use Channel 11 for SoftAP
2015-07-24 05:10:32 +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
Jorim Jaggi
1997eb104d am b3544372: am 929a82c8: am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped
* commit 'b3544372ba519f96b37f77b3d986d7db1312f975':
  Partially fix that beginning of animation is skipped
2015-07-24 05:09:53 +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
Tim Kilbourn
4d2c2583df am a714a4a7: am 2f778da1: am 46638832: am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit 'a714a4a77020303c5ab9464781464bd050110525':
  Add a wm command to dismiss the keyguard.
2015-07-24 04:06:09 +00:00
Svetoslav Ganov
cb731204c4 am ce4668b6: am 3fce45b6: am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
* commit 'ce4668b6be8f66625fcea4331baf5cc8e7d6dee1':
  Reset permissions and app links when clearing app preferences - framework
2015-07-24 04:06:03 +00:00
Svetoslav Ganov
7ddfc7b024 am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '1c37dc8197ca0f85ae32304930ec254d0ba9911e':
  Shut down UiAutomationConnection without a lock held
2015-07-24 04:05:56 +00:00
Tim Kilbourn
096b562ec3 am 79383d53: am 1c78d467: am 115189fd: am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
* commit '79383d53bc69adaebd4e195e78bf7dfe1867f03a':
  Properly synchronize interactivity state.
2015-07-24 04:05:50 +00:00
Jason Monk
17127a3cb6 am 184044e4: am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit '184044e499a36297e01ce6d3bd55b7c9026be178':
  Fix emergency only when no sims
2015-07-24 04:05:42 +00:00
Julia Reynolds
cf533d1cf7 am 969bc9f7: am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
* commit '969bc9f7da19cb429ca850fe6205a9a9b48e1c6d':
  Set 'the' media notification to the notification actually playing.
2015-07-24 04:05:35 +00:00
Jorim Jaggi
48692f6e19 am dd0b42d4: am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS
* commit 'dd0b42d42dab9b0f48719d56d69f47a2e7a3f8cd':
  Make sure expandingFinished gets called when going into QS
2015-07-24 04:05:29 +00:00
Wenchao Tong
34f055ab9f am 52dd36cb: am 1770cb41: am 25975f1b: am bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
* commit '52dd36cb67dcc7741704147876c7efbb713dea0b':
  Ignore the active network scorer when checking for idleness
2015-07-24 04:05:22 +00:00
John Reck
11f9da310a am bdb2a905: am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup
* commit 'bdb2a90570b6fcdcb85d010070f77f7cea61e41a':
  Fix a race condition that could cause lockup
2015-07-24 04:05:13 +00:00
Amith Yamasani
63af491023 am 81b5d555: am 448af885: am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
* commit '81b5d5550c7a9705b25e455b19a90eeb151a2182':
  Avoid a deadlock between PMS and AppOpsService
2015-07-24 04:05:06 +00:00
Alex Klyubin
aec5a14e6c am 6d8cf7a7: am bb320299: am 155d41a0: am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
* commit '6d8cf7a7a063cfa0c37ea85946c6f1fe105435c5':
  Document what algorithms Android Keystore supports.
2015-07-24 04:04:56 +00:00