7901 Commits

Author SHA1 Message Date
Svetoslav Ganov
3b3d9f8415 Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev
am: 21da54587b

Change-Id: I332d4aeeb7eb14a0b51a60382c8efedf4e1d5375
2017-04-14 23:34:22 +00:00
Roozbeh Pournader
2ad47527f8 Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev
am: 2a05c5edb7

Change-Id: I4752951eee34ec5e98368a1b0a68ecb3cbf449cb
2017-04-14 23:33:01 +00:00
Svetoslav Ganov
21da54587b Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev 2017-04-14 23:22:31 +00:00
TreeHugger Robot
2a05c5edb7 Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev 2017-04-14 23:22:12 +00:00
Eugene Susla
4df89bcb31 [DO NOT MERGE] Fix associations serialization optimization bug
There mas a missing defensive copy causing false positive detections of
"associations not changed" case, leading to xml file not being updated once
at least one record is present

Bug: 30932767
Test: Associate at least two different devices and ensure the xml has both.
Change-Id: Ic0dc615dd2b847e137555c1084c616831b4dde83
2017-04-14 23:21:44 +00:00
Roozbeh Pournader
3f01530a68 Support overriding display locale for SuggestedLocaleAdapter
The method now accepts a locale for overriding the labels
"Suggested", "All regions", etc.

Fixes: 31257462
Test: Manual
Change-Id: I6e8c95d8d3e7b05a284b171f2cf2819d32e53d8d
2017-04-14 11:13:27 -07:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
2017-04-14 17:04:19 +00:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Alan Viverette
51efddbd3b Remove unnecessary casts on calls to findViewById
Just frameworks/ this time. More paths to come.

Bug: 24137209
Test: make -j32
Change-Id: Iff27abd26fa43296ac2fff8f534fc6742d2ae80c
2017-04-14 11:15:50 -04:00
Casey Burkhardt
549a439b53 Merge "Icon assets for magnification" into oc-dev
am: 4d386d5ce7

Change-Id: I2d75a1bdbaff4ec53b7c7a903374932e092de2cf
2017-04-14 07:48:19 +00:00
TreeHugger Robot
4d386d5ce7 Merge "Icon assets for magnification" into oc-dev 2017-04-14 07:41:40 +00:00
Jeff Sharkey
4e544771dd Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev
am: f5d5e5e4bf

Change-Id: I2af664620bdaf6fa4551aade80e56decf0995838
2017-04-14 04:30:50 +00:00
Casey Burkhardt
c2492739da Icon assets for magnification
Adds updated assets for the magnification icon to
AccessibilityButtonChooserActivity.

Bug: 37295643
Test: Manual - verified icon appearance in chooser
Change-Id: I1ddfb01889c86b481b2df0f924be6c0dc8daae04
2017-04-13 20:52:11 -07:00
TreeHugger Robot
f5d5e5e4bf Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev 2017-04-14 03:37:37 +00:00
Lorenzo Colitti
d6af00f5e4 resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp
Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91
2017-04-14 11:37:12 +09:00
Jeff Sharkey
e5e2569a1f Relax enforcement of GET_USAGE_STATS permission.
This matches the logic used in all other places where we check for
this app-op.

Test: builds, boots
Bug: 37315351
Change-Id: I1fef7d30709d24c3f8978d33271a15b37b2ccc26
2017-04-13 19:54:51 -06:00
Jesse Hall
e20f42b8a9 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev
am: 8cafe5d9b4

Change-Id: I024b5cf450aa2832bdd2638bd83b6d5048b80a7f
2017-04-14 01:10:49 +00:00
TreeHugger Robot
4db137b059 Merge "Connectivity metrics: add transports pretty printing" into oc-dev 2017-04-14 01:08:54 +00:00
TreeHugger Robot
8cafe5d9b4 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev 2017-04-14 01:00:46 +00:00
Jesse Hall
5d911fe6bb Allow disabling GL preload even if gfxdriver isn't updatable
Bug: 34611670
Test: set ro.zygote.disable_gl_preload=1, shell start,
      confirm GL driver isn't loaded in zygote process
      by checking /proc/<pid>/maps

Change-Id: Ieb739bd7eba365917684cf830d78c15fea06f8cf
2017-04-13 15:53:28 -07:00
Hugo Benichi
a365bace7a Connectivity metrics: add transports pretty printing
This patch also
  - partially reverts commit f927f0c52e7df5b057e7d28888c3cfed164d241a
    that exposed a getTransports method on NetworkCapabilities.
  - moves enumerateBits to BitUtils (as unpackBits), and adds the
    reverse packBit method.

Bug: 34901696
Test: manually looked at $ adb shell dumpsys connmetrics list
Change-Id: I1650daf8fc9c1b6e0d986d2285f81e888be8847f
Merged-In: Id04f9080e7f75608deeb49306aec34941e71794c

(cherry picked from commit df456e13a1127e3c8594b1d22ea4a9b3dca67a4b)
2017-04-13 22:17:50 +00:00
Bookatz
53b7ff2014 Merge "Collect background stats: syncs" into oc-dev
am: a8fc7bff5a

Change-Id: Id3f2d7b2a77c74657416e492519f2205bc46218a
2017-04-13 21:31:05 +00:00
TreeHugger Robot
a8fc7bff5a Merge "Collect background stats: syncs" into oc-dev 2017-04-13 21:20:14 +00:00
Adam Lesinski
51d94c82af Merge "BatteryStats: Remove reading of cpu power" into oc-dev
am: af85d84050

Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
2017-04-13 20:22:19 +00:00
Adam Lesinski
af85d84050 Merge "BatteryStats: Remove reading of cpu power" into oc-dev 2017-04-13 20:09:51 +00:00
Bookatz
2bffb5bb3a Collect background stats: syncs
Added background times and counts for an app's sync usage.

Bug: 35669746
Test: runtest -x
frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java

Change-Id: I1c01c5044064277b97e8d330386454da3e8204da
2017-04-13 11:59:33 -07:00
Dianne Hackborn
59c6507670 Merge "Allow appops command to modify uid ops." into oc-dev
am: 81bfe1f62e

Change-Id: I843f40212346a3edaf219af5ec47ba16428914ad
2017-04-12 21:51:00 +00:00
Dianne Hackborn
81bfe1f62e Merge "Allow appops command to modify uid ops." into oc-dev 2017-04-12 21:37:52 +00:00
Adam Lesinski
d4abd1eeb0 BatteryStats: Remove reading of cpu power
The cpu power reported by the uid_cputime kernel is inaccurate
and has only ever been recorded for dumping to batterystats.
The values have never been used in power blame calculations.

This change removes these power values which just cause noisy
data.

Bug: 36002715
Change-Id: I61bea9992aabb84d099689360fd9377b44b36e2f
Test: run `adb shell dumpsys batterystats`
Test: should not show `p=` for `Total cpu time:` line
2017-04-12 12:25:21 -07:00
Michael Wright
719d1f06fb Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev
am: 7ecd40c1fc

Change-Id: I003b2cfcdb10a4d9c999ba9cd575561bf7b70086
2017-04-12 14:23:20 +00:00
Michael Wright
936f27cbf7 Always request keyboard shorcuts, even if there's no menu.
Bug: 36964520
Test: cts-tradefed run cts-dev --module CtsAppTestCases -t android.app.cts.ActivityKeyboardShortcutsTest#testRequestShowKeyboardShortcuts
Change-Id: Idc2224260470dfd58a08cd8b2df5d8de67fbaea4
2017-04-11 23:23:42 +01:00
Dianne Hackborn
c7214a3ade Allow appops command to modify uid ops.
The get and set commands can now operate on per-uid
app ops as well as per-package ones.

The to parse a uid string in to a more generic place, but
for now we'll leave it here.

Test: none

Change-Id: I7efbb3966ddb79639dafabbe4bf1df659bed6240
2017-04-11 13:34:14 -07:00
Jorim Jaggi
4d384aa34e Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev
am: 971fe468a4

Change-Id: Id22f93bb9250f587c678a401fa57507784a58ebc
2017-04-11 18:30:18 +00:00
TreeHugger Robot
971fe468a4 Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev 2017-04-11 18:16:00 +00:00
Jorim Jaggi
30d64f3a93 Revert "Revert "Handle case when snapshot dimensions don't match""
This reverts commit ba53d8ae410976709e1413b74173a791e8dead15.

Also fixes that we always had a size mismatch.

Test: TaskSnapshotSurfaceTest
Test: Open app in different orientation than snapshot, make sure
looks ok.

Bug: 36991071
Change-Id: If572b68fd72cec7679984fdff0be5905caba69f4
Fixes: 36703868
2017-04-10 18:10:44 -07:00
Bookatz
3c820a12f1 Merge "Fix double-detach DualTimer bug" into oc-dev
am: 754c46db37

Change-Id: Icc8abb22b32493f2bdf1d50350f7a2588ab627cb
2017-04-10 23:53:08 +00:00
TreeHugger Robot
754c46db37 Merge "Fix double-detach DualTimer bug" into oc-dev 2017-04-10 23:33:45 +00:00
Bookatz
4a3eda992b Fix double-detach DualTimer bug
DualTimer attempted to detach its subTimer twice when reset(true) was
called, once explicitly and once via a call to the main timer. This
fixes that problem by getting rid of the explicit detach in reset.

Bug: 37208694
Test: runtest -x
frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
and manually looked for "Removed unknown observer" error in logcat.

Change-Id: Ic5ff7d799d46236a74ab0825e108bef40bac0360
2017-04-10 14:28:00 -07:00
Andrii Kulian
f44551b505 Merge "Fix activity move between displays" into oc-dev
am: c2ec7bf965

Change-Id: I7831bea7832d4a0ddd1f841c9ce2cce5bda403c7
2017-04-10 19:35:28 +00:00
Andrii Kulian
c2ec7bf965 Merge "Fix activity move between displays" into oc-dev 2017-04-10 19:20:37 +00:00
Eugene Susla
d2d45e9de8 Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
am: 0ac8fd7adb

Change-Id: Icb3fa2e51547fc50cc161052ca83050b5539a1f9
2017-04-10 15:18:14 +00:00
TreeHugger Robot
0ac8fd7adb Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev 2017-04-10 15:06:10 +00:00
Bookatz
7b6128e54b Merge "Fix counting problems in StopwatchTimer." into oc-dev
am: eca0d421d1

Change-Id: I690fbd08ec678819200e8d7019f0972511a51fcc
2017-04-09 19:02:13 +00:00
TreeHugger Robot
eca0d421d1 Merge "Fix counting problems in StopwatchTimer." into oc-dev 2017-04-09 18:54:34 +00:00
Philip P. Moltmann
a839e15a65 Merge "Restore session on new window after app kill" into oc-dev
am: 51785edbe9

Change-Id: I692398a7f044db7f50e1b2f5155e4683f6f5bc31
2017-04-08 02:40:33 +00:00
TreeHugger Robot
51785edbe9 Merge "Restore session on new window after app kill" into oc-dev 2017-04-08 02:35:35 +00:00
Andrii Kulian
51c1b67022 Fix activity move between displays
1. ActivityConfigCallback might not have been registered
because DecorView was not yet attached to window and ViewRootImpl
was not available. In this CL the callback is set as soon as a
DecorView is attached to window.
2. When private display was removed from system, its stacks were
moved to bottom in AM but moved to top in WM.
3. When reparenting stack visibility of activities should be updated
before reparenting in WM, because otherwise WM will be resizing
windows that should no longer visible and reporting it to clients.

Bug: 34164473
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testOnMovedToDisplayCallback
Test: #testContentDestroyOnDisplayRemoved
Change-Id: I6ccc27d873d0d60d7650659fb25cbfcaaeb0fd07
2017-04-07 18:39:32 -07:00
Mathieu Chartier
56c80e9adb Merge "Enable profiling for system server for userdebug|eng" into oc-dev
am: 4567c1a1a3

Change-Id: Iefc5c2a9ca115d2df1c7c8a1e41a02be2afcfd90
2017-04-08 01:34:31 +00:00
Mathieu Chartier
4567c1a1a3 Merge "Enable profiling for system server for userdebug|eng" into oc-dev 2017-04-08 01:26:57 +00:00
Mathieu Chartier
b3eecebddd Enable profiling for system server for userdebug|eng
Only for these two configurations since selinux permissions only
allow system_server to access profiles in these cases.

Motivation is to allow collecting profiles for improving RAM and
performance for preopt.

Setting the property dalvik.vm.profilesystemserver to true is required
to enable the collection of profiles for system server.

Test: device boots

Bug: 34927277
Bug: 36457259

Change-Id: Icbba6dafe376fd9c6c3d0c7feba7f64009f7c2c3
2017-04-08 01:23:05 +00:00