205109 Commits

Author SHA1 Message Date
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
Deepanshu Gupta
e8018480db CalendarView rendering: use R.styleable to find attr.
Not all attr are added to R.attr. This results in some attr not being
found and hence a broken rendering. Fix the issue by adding all attr
referenced in R.styleable to the map of attr before adding any remaining
values from R.attr.

Change-Id: I1ebf8a394b9e1edbf7490e011833d20a00d38317
2015-07-23 11:59:09 -07:00
Jorim Jaggi
1d071ce9b1 Make sure expandingFinished gets called when going into QS
Bug: 22351040
Bug: 22306637
Change-Id: I8d1f9fb400b328753bd8444bf3b4a744ad23a53a
2015-07-23 18:56:03 +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
Jason Monk
b0808aab0c Fix emergency only when no sims
Need to look at a ServiceState to determine if we are actually in
a emergency only state.

Bug: 22619451
Change-Id: I06a2a6fab85ed2ce41d8f7cbb98a1f169ec61b33
2015-07-23 14:20:18 -04:00
Wenchao Tong
bf3a24d5ec Merge "Ignore the active network scorer when checking for idleness" into mnc-dev 2015-07-23 18:14:47 +00:00
Michael Wright
a405121b5a Properly synchronize interactivity state.
Volatile doesn't provide any guarantees with respect to write
visibility, so it's possible that PowerManager will tell InputManager
about a change in interactivity state, but the actual dispatching
thread will never observe it.

Also, add logging about NativeInputManager state.

Bug: 22422588
Change-Id: Ifc3add992b9009d920d80a0315ff89c9574be20d
2015-07-23 19:04:33 +01:00
Svet Ganov
9c8b8ab941 Reset permissions and app links when clearing app preferences - framework
bug:22359132

Change-Id: I198c0b1cd6c3dcb91fe560874a8502eb6b5f65b3
2015-07-23 10:36:35 -07:00
John Reck
2abf0f24af Fix a race condition that could cause lockup
Bug: 22676664

If a task is queued on a worker thread that is busy
processing a task AND a trim memory signal comes along
prior to the initial task being completed then the
tasks that were queued prior to the exit request will
never be processed.

This is bad, as when those futures are used later on, such
as in trying to delete them from the cache, they will block
waiting for the orphaned task to be finished.

Simple fix is to just never stop the worker threads. Increase
RAM usage slightly as we won't reclaim that stack space, but
this cost is fairly small

Change-Id: I818b011f9bc6ba06942fdad81c27656bd97b42d4
2015-07-23 17:34:14 +00:00
Amith Yamasani
b3e407609f Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev 2015-07-23 17:22:29 +00:00
Alex Klyubin
304b01c249 Merge "Document what algorithms Android Keystore supports." into mnc-dev 2015-07-23 16:23:59 +00:00
Junda Liu
859551f7c0 Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev 2015-07-23 16:20:35 +00:00
Jean-Michel Trivi
7f9e9012f4 Merge "RingtoneManager: query results depend on caller permission" into mnc-dev 2015-07-23 15:59:20 +00:00
Jack Yu
e21722a3da Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev 2015-07-23 15:51:13 +00:00
Geoff Mendal
13edc1609e Import translations. DO NOT MERGE
Change-Id: If02d6e590724181954e4b3f890f1fd5a132f392d
Auto-generated-cl: translation import
2015-07-23 00:28:45 -07:00
Jack Yu
a4f2da3988 Allow carriers to force disable ETWS/CMAS test messages.
This feature can be enabled in carrier config XML. When enabled, the user will not see
ETWS/CMAS enable/disable option in emergency broadcast preference menu.

bug: 22396039
Change-Id: I6ad6fa39852d3b13faeef968a1963b3e0a4a6e61
2015-07-23 05:21:54 +00:00
Svet Ganov
7bb48725de Shut down UiAutomationConnection without a lock held
bug:22599759

Change-Id: I90bca614960522269497127658c16b0bb6ec0476
2015-07-22 19:03:29 -07:00
Nick Kralevich
06b93a48ad Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev 2015-07-23 01:46:38 +00:00
Nick Kralevich
0d767e6f09 Revert "UsbDeviceManager: fix b/21429947 regression"
This causes various problems with our testing infrastructure.

This reverts commit b210026e3d5c955628ca8b8b9191ade08891e9ef.

Bug: 22447614
Bug: 21429947
Change-Id: I57623e3d993e65b6ad89e7a7d28e9575cf638994
2015-07-23 01:45:01 +00:00
Svetoslav Ganov
492fc64831 Merge "Grant record audio to system reco service by default" into mnc-dev 2015-07-23 01:13:24 +00:00
Adam Lesinski
f90ed330a0 Merge "UsageStats: Reduce log spam during time change" into mnc-dev 2015-07-23 01:01:22 +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
Adam Lesinski
2dfb91412c UsageStats: Reduce log spam during time change
With lots of usage stats files, the log gets spammy
when the time changes and we are moving files around.

Bug:22549399
Change-Id: I9da39399b090066d52568dea6fc5b59aba063c5a
2015-07-22 17:35:46 -07:00
Svetoslav
c6ab8b9ecb Grant record audio to system reco service by default
bug:22668415

Change-Id: I0fec7cc671bb1cc3a13b870748fc8e110a11250e
2015-07-22 17:35:41 -07:00
Dianne Hackborn
5507bb41b0 Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 2015-07-23 00:35:34 +00:00
Svetoslav Ganov
41a62e111d Merge "Do not show normal permissions in sideloading UI" into mnc-dev 2015-07-23 00:27:16 +00:00
Dianne Hackborn
d48954fb6b Fix issue #22414729: Checkin start clock time is different from hsitory reset time
There was a mistake in the code that was supposed to recover from the
initial time on a new device being bad until the real time ultimately
gets set, which was causing us to update the start clock time every time
there was a time change (instead of just when the original start time
appears bad).

Rework all of this, so we now count the start time as bad if it is more
than one year before the current time, only modifying it in that case.
Also when modifying it, adjust the time we set it to take in to account
how much realtime has actually elapsed so far in the battery stats.

Change-Id: If74bd711d9b7618c8f6148a9935c452aaaa7e257
2015-07-22 17:26:32 -07:00
Svetoslav
a3f68ef2f6 Do not show normal permissions in sideloading UI
bug:22627493

Change-Id: I5bb900bb2cd68893c21d9e9b2c973d331d355b58
2015-07-22 17:05:05 -07:00
Dianne Hackborn
3e8125b40e Fix issue #22653116: Google App crashing on NYT app
We weren't correctly handling the root view of the window --
we were just pushing it on to the stack, but that means it got
written at the end.  Instead, we now immediately write it
after the window and let things follow from there.

Change-Id: I070c96bd2443f312a7c6f495d1bf72fa19c614d6
2015-07-22 17:02:10 -07:00
Fyodor Kupolov
a0a71d8a22 Merge "Fixed a typo" into mnc-dev 2015-07-22 23:57:00 +00:00