209126 Commits

Author SHA1 Message Date
Adrian Roos
6b32c53bcf am 06913a53: am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
* commit '06913a539b80b0a93b34dc4befad9ea30eb82cdb':
  Fix cut off charging indication in certain scripts
2015-07-24 03:36:23 +00:00
Dianne Hackborn
00e9e97f70 am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev
* commit '47fefc5c311dffe549d10e535fe5f2cec77567fc':
  Fix issue #22653116: Google App crashing on NYT app
2015-07-24 03:36:17 +00:00
Svetoslav Ganov
71fa8e192c am 059841e2: am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
* commit '059841e21348ed4173b6387b382e9017fea34a42':
  Do not show normal permissions in sideloading UI
2015-07-24 03:36:10 +00:00
Fyodor Kupolov
142e21b24c am bcf1c522: am c00d2713: am a0a71d8a: Merge "Fixed a typo" into mnc-dev
* commit 'bcf1c52252a131513012038c3535794b85604f11':
  Fixed a typo
2015-07-24 03:36:04 +00:00
Adam Lesinski
91211df655 am e63d3144: am a403d5cc: am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
* commit 'e63d3144da8096387325ddbf4998a110ff1c865d':
  UsageStats: Gracefully handle corrupt filenames
2015-07-24 03:35:57 +00:00
Adrian Roos
32e8de05fc am 81c6a311: am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
* commit '81c6a311fd2e6c5326a85deb638af7f861e7605c':
  Protect demo mode commands with permission
2015-07-24 03:35:51 +00:00
Jae Seo
e47e3b1902 am 8d121cf3: am d8162e47: am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
* commit '8d121cf322572622b743dc23d90dc2e7bdcdb014':
  TIF: Enable hardware acceleration on overlay
2015-07-24 03:35:45 +00:00
Svetoslav Ganov
1ad413c010 am af27474f: am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
* commit 'af27474fd55c670cb5eb8576bc9a965c21dc403b':
  Add a privileged permission to get user accounts
2015-07-24 03:35:39 +00:00
John Reck
e8b154a05f am 8fb2a4fa: am 3328fe58: am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
* commit '8fb2a4fae53a3086837722f147aaf5899bb4a165':
  Fix ATLAS_MAP_ENTRY_FIELD_COUNT
2015-07-24 03:35:33 +00:00
Adam Lesinski
602d71db2e am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit '898e3dda949f305a64e249b1571a9b5d2853887b':
  BatteryStats: Use English locale for dump and checkin data
2015-07-24 03:35:26 +00:00
Nick Kralevich
01e00c8ce0 am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev
* commit 'e4f10de7d2170b319dc987c1cd4e2ad3c464ead9':
  UsbDeviceManager: fix b/21429947 regression
2015-07-24 03:35:19 +00:00
Chris Wren
99547e494a am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
* commit 'b86df334f778eecbf4beaaa9127e7e523e55fb6c':
  Don't crash sysui when advisory calls fail.
2015-07-24 03:35:13 +00:00
Tim Kilbourn
d8f08d651f am cd03be66: am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
* commit 'cd03be66e86d43ac64e487826b27e9c2c9a5b634':
  Miss USB device Interface from UsbManager.getDeviceList().
2015-07-24 03:35:07 +00:00
Alan Viverette
35b1674a24 am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
* commit '9b4917a6f8ccd3a9faac08859d263f58e33f6357':
  Fix handling of RelativeLayout measurement using UNSPECIFIED spec
2015-07-24 03:35:00 +00:00
Fyodor Kupolov
5192e4b2c0 am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev
* commit '030f273550eb0f0f53c43c3852d40433a0315649':
  Added a note about location permission
2015-07-24 03:34:53 +00:00
xin He
b76cc9105d am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
* commit '4a4e06477b9af816c15c2a212f028053285df5ef':
  Angler Should Not Use Channel 11 for SoftAP
2015-07-24 03:34:47 +00:00
Jeff Sharkey
aebcf3b7ef am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit '23fdb6355ee4cc1230d88447d3925f2b504e4f4e':
  More info to support CTS, fix reconcile bug.
2015-07-24 03:34:41 +00:00
Jason Monk
dea13a9623 am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
* commit 'c063146fb2de35908183a52b2ff50934ad40c653':
  Add metrics to tuner
  Move tuner enable point to QS
2015-07-24 03:34:32 +00:00
Jorim Jaggi
929a82c81f am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped
* commit 'a0d142d9425e542b58721cbfcf7a032e7c503521':
  Partially fix that beginning of animation is skipped
2015-07-24 03:34:25 +00:00
Dianne Hackborn
14aca8e87a am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
* commit '63ff4a77f35d578f2c543cefeb0e6175365c60bb':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
2015-07-24 03:34:19 +00:00
Jim Miller
56e1be700d am ecfbd588: am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit 'ecfbd58887114aa0626d6ec0f3f5e55e48ec4a49':
  Add FEATURE_FINGERPRINT to PackageManager's feature list
2015-07-24 03:22:48 +00:00
Jean-Michel Trivi
938e8e302d am 9f4b7a47: am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
* commit '9f4b7a47a7887ea04f568cfc69bbf67d298e436e':
  MediaPlayer subtitle controller: use debug log instead of warning
2015-07-24 03:12:50 +00:00
John Reck
9ba771bbcb am c2db381e: am 6b66a4a8: use findProcess instead of getProcess
* commit 'c2db381ecc4b54e9f52f9d675336db86cad96b14':
  use findProcess instead of getProcess
2015-07-24 03:12:45 +00:00
Amit Mahajan
b621b71cb0 am ae5569de: am eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
* commit 'ae5569de625a1622f61cee671fdb92974c4ef5f1':
  UICC : discard language setting of SIM
2015-07-24 03:12:14 +00:00
Adrian Roos
caf526eff1 am 9e289b05: am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
* commit '9e289b05453f40f1e5855a972a53eaff92fe5268':
  Disable Keyguard affordances before setup is completed
2015-07-24 03:12:08 +00:00
Svetoslav Ganov
7bda4b9672 am 79355545: am 28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
* commit '793555452ad44c006657b6c511c5c6068c0317ba':
  Keep default permission grants uninstalling a sys package upgrade
2015-07-24 03:12:04 +00:00
John Reck
452b62e1d9 am c5d3dde6: am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit 'c5d3dde6c70e7d7e83cad85cfd6720f4017a7498':
  Move updateMatrix() call to animateCommon
2015-07-24 03:12:00 +00:00
Deepanshu Gupta
3420d57972 am 0e0d4ec9: am f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
* commit '0e0d4ec99f8ee9248f5eee3f4596ecbfc80f10c2':
  Set support flag for custom layouts for RecyclerView.
2015-07-24 03:11:56 +00:00
Yohei Yukawa
646f9da9e2 am 4ff108f0: am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
* commit '4ff108f0828f9c830aa93a3269c071522dae40ad':
  Don't rely on broadcast intent for waking up input method.
2015-07-24 03:11:42 +00:00
Deepanshu Gupta
e45289f5ed am f5ba5356: am 49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev
* commit 'f5ba535684939328e719051f8403b35bd1e0e2fc':
  LayoutLib: translucent sys ui bars
  Move the layout code out of RenderSessionImpl.
2015-07-24 03:11:34 +00:00
Deepanshu Gupta
2df99f99e9 am 678aef41: am f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
* commit '678aef4125e9d56f2cc2362e71c921bf596ca903':
  CalendarView rendering: use R.styleable to find attr.
2015-07-24 03:11:29 +00:00
Tim Kilbourn
2f778da1cb am 46638832: am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit '46638832458d14c6f785b58618eba9dfec796412':
  Add a wm command to dismiss the keyguard.
2015-07-24 03:11:03 +00:00
Svetoslav Ganov
3fce45b661 am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
* commit '54f1db793264192017c588b618c7d4cb311482c0':
  Reset permissions and app links when clearing app preferences - framework
2015-07-24 03:10:58 +00:00
Svetoslav Ganov
dd12420e27 am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit 'f9044dcc2752be620b8f6b0a6ead0e7fef9b2c10':
  Shut down UiAutomationConnection without a lock held
2015-07-24 03:10:52 +00:00
Tim Kilbourn
1c78d46788 am 115189fd: am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
* commit '115189fd6bd3e2e357623e19e8f755bd6a3d5a68':
  Properly synchronize interactivity state.
2015-07-24 03:10:31 +00:00
Jason Monk
42caf39947 am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit 'e648ccbbf79924316cbf1da328e83cf23cd1de72':
  Fix emergency only when no sims
2015-07-24 03:10:23 +00:00
Julia Reynolds
0aea721db2 am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
* commit '9bef274ce9a00bcbc693c933dc3806b5ea36f44b':
  Set 'the' media notification to the notification actually playing.
2015-07-24 03:10:00 +00:00
Jorim Jaggi
c7dea8b38f am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS
* commit '9c95638495ce1f3600b6c8a3169433b99d7f2575':
  Make sure expandingFinished gets called when going into QS
2015-07-24 03:08:48 +00:00
Wenchao Tong
1770cb419e am 25975f1b: am bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
* commit '25975f1b223e63e31b70431c069cf1e8e296b0c4':
  Ignore the active network scorer when checking for idleness
2015-07-24 03:08:43 +00:00
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