Commit Graph

71983 Commits

Author SHA1 Message Date
Marie Janssen
5c7ef9ccc7 resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp am: f2fc15824d
am: 2f94877c01

Change-Id: I00f1e604816bd95b4ecc3063209e38780a4e8675
2016-12-15 00:27:08 +00:00
Marie Janssen
2f94877c01 resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp
am: f2fc15824d

Change-Id: I71d80c8a24f206d5919f56a28b1f1333021b7d46
2016-12-14 23:27:54 +00:00
Eino-Ville Talvala
52d600769c Merge "Camera: Updates in preparation for HIDL" 2016-12-14 23:08:14 +00:00
TreeHugger Robot
04b2be42c3 Merge "Deprecate android.text.AndroidCharacter" 2016-12-14 22:20:58 +00:00
Marie Janssen
f2fc15824d resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp
Change-Id: I903680717ed121a93fee3b7c2ed358cb29726d71
2016-12-14 13:44:28 -08:00
TreeHugger Robot
db10a2094c Merge "Remove accidentally exposed Geofencing classes." 2016-12-14 20:15:27 +00:00
TreeHugger Robot
7198ca863e Merge "Fix merge for OnDrawListener" 2016-12-14 20:12:35 +00:00
Marie Janssen
7a2518ee6e Merge "Bluetooth: log message improvements"
am: f34bdf7676

Change-Id: Ic89c59257559d95119829fa4157dbb763124e86f
2016-12-14 20:01:39 +00:00
Kang Li
b431d715a3 Merge "Add Sharing Histories to UsageStatsManager." 2016-12-14 19:26:34 +00:00
Esteban Talavera
06fd71abdf Merge "Create DISALLOW_{ADD,REMOVE}_MANAGED_PROFILE user restrictions" 2016-12-14 19:16:26 +00:00
Phil Weaver
9a14b56b60 Merge "Add null check to a11y interrupt." 2016-12-14 18:49:30 +00:00
TreeHugger Robot
a97a01e5a2 Merge "Added supports-split-screen-multi-window command to am" 2016-12-14 18:43:28 +00:00
Philip P. Moltmann
fbf2adaf6e Do not write if apply() did not change the file.
am: ea10cc0fbb

Change-Id: I58f1f71dd4a8b4725205555531fa5d66284e3cd0
2016-12-14 18:21:39 +00:00
Philip P. Moltmann
2f1bb85277 Only persist last Shared Preferences state
am: 31d6889f4c

Change-Id: I0324e5e391d3d426cef8ef52ea04f529c5c7580f
2016-12-14 18:21:33 +00:00
Marie Janssen
cb21ad71ed Bluetooth: log message improvements
Some log improvements:
 - Reduce logspam
 - Use names for states in logs instead of numbers
 - Be more consistent with messages

Also remove some commented out dead code.

Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
2016-12-14 09:51:30 -08:00
TreeHugger Robot
9112c16e16 Merge "Adding public API for marking nodes as clusters and sections." 2016-12-14 17:17:35 +00:00
Derek Sollenberger
3eda170b77 Merge "Remove Rasterizer and its subclasses from the public API." 2016-12-14 17:16:04 +00:00
Roozbeh Pournader
9559c20a39 Deprecate android.text.AndroidCharacter
AndroidCharacter was added to compensate for limitations in
java.lang.Character, but it has been outdated and its functionality
is provided with a much better API by android.icu.lang.UCharacter.

Bug: 32551718
Test: cts-tradefed run cts-dev --module CtsTextTestCases --test android.text.cts.AndroidCharacterTest
Change-Id: Iec1969dc5787a4ebb0e68cdc213d3d0cdc3b2d0d
2016-12-14 17:08:56 +00:00
Michal Karpinski
e093a98925 Merge "Fix javadoc for PackageManager#getNameForUid()" 2016-12-14 11:44:02 +00:00
Michal Karpinski
ea792a7c11 DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
am: e3639a0a07

Change-Id: Ie91f46915144c0f15e9a058b45ca7e55c54f796c
2016-12-14 10:58:22 +00:00
Michal Karpinski
306b268fb7 DO NOT MERGE Fix Lint errors for network logging API
am: 0c4ec00f85

Change-Id: I3fc8e08509440057c1d87dd2023cd2b7d8177530
2016-12-14 10:57:26 +00:00
Michal Karpinski
fd4ec31313 DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times
am: bbf352a2c1

Change-Id: I6df35873ec30044780fab02329bab327af8df161
2016-12-14 10:52:18 +00:00
Andrei Stingaceanu
79ada3015b Merge "AutoSize TextView (part 4) - autosize when layout changes" 2016-12-14 10:51:56 +00:00
Michal Karpinski
d1c710d5cf DO NOT MERGE [DPM] Management and retrieval of network logs
am: 4c47adef60

Change-Id: I39486c9d6116023f1ee9bd576b7fcd0fe20023a1
2016-12-14 10:51:33 +00:00
Michal Karpinski
b2e8690507 DO NOT MERGE [DPM] DO can start network logging and listen for events
am: c3abd34cfe

Change-Id: I7952d67d22a141040f3ee3ac2b6c3aa2cfccbbf7
2016-12-14 10:50:36 +00:00
Lenka Trochtova
3c9c96d8dc Merge "DevicePolicyManager: make 3 hidden provisioning methods system API." 2016-12-14 09:22:02 +00:00
TreeHugger Robot
76c9a0d2f4 Merge "Add an IPC for requesting network scores." 2016-12-14 03:20:06 +00:00
Kang Li
53b4314ad9 Add Sharing Histories to UsageStatsManager.
This CL is for Android O Smart-Sharing (b/30982298). By this CL, sharing
counts are logged with UsageStatsManager.

Bug: 30982298
Test: manual - shared images in Camera and texts in Chrome using a mobile device.

Change-Id: I0b4aa0506f99b3083d140a48f7b4bdd5b1c5afb6
2016-12-13 17:35:38 -08:00
Jeremy Joslin
b2087a159b Add an IPC for requesting network scores.
Migrating the NetworkScoreManager.requestScores() method to use an
IPC rather than a broadcast.

Defined the new IPC in the AIDL files for NetworkScoreService and
NetworkRecommendationProvider. Added a no-op implementation in
NetworkScoreService and a full implementation in
NetworkRecommendationProvider (plus tests).

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
BUG: 33593157
Change-Id: I951f6186aa11ddbe5a94e374173a1fd40b2a4cce
2016-12-13 17:06:56 -08:00
Philip P. Moltmann
ea10cc0fbb Do not write if apply() did not change the file.
Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
2016-12-14 01:00:37 +00:00
Philip P. Moltmann
31d6889f4c Only persist last Shared Preferences state
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.

For commit() we need to make sure that we have at least persisted the
state of the commit.

Generation counts are 64 bit, hence they never overflow.

Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
2016-12-14 00:56:03 +00:00
Ruben Brunk
58369e3d53 Prevent crash on uninstall. am: 12ab5e1d70
am: a1501095cf

Change-Id: I62bbc3c8e228b6dcda8d8edcb22d29634cabf271
2016-12-14 00:41:45 +00:00
Ruben Brunk
a1501095cf Prevent crash on uninstall.
am: 12ab5e1d70

Change-Id: I8301d17bb0bbd16a4adeaadb7b7bd04ad7159407
2016-12-14 00:34:59 +00:00
Ruben Brunk
f755dfb89e Merge "Prevent crash on uninstall." into nyc-mr2-dev 2016-12-14 00:24:41 +00:00
Robert Carr
948eb32664 [DO NOT MERGE] Prevent crash from early Toast surface destruction.
am: 0bfaa461c6

Change-Id: I78c60bbb725cb3ea694f090e4f493c7a8247a41b
2016-12-13 23:02:22 +00:00
Philip P. Moltmann
60b98d391f Merge "Do not write if apply() did not change the file." 2016-12-13 22:50:31 +00:00
Rob Carr
b8eac24ff2 Merge "Correct error in Configuration.updateFrom" 2016-12-13 22:34:30 +00:00
Robert Carr
0bfaa461c6 [DO NOT MERGE] Prevent crash from early Toast surface destruction.
To understand this change it's first helpful to review Toasts.
The ViewRoot is constructed on the client side, but it's added,
to a window token controlled by the NotificationManagerService.
When we call NotificationManagerService#cancelToast, the system
will remove this window token. With the window token removed,
the WindowManager needs to destroy the surface to prevent orphaned
windows. If we destroy the Surface before removing the toast on the
client side however, we've never asked the ViewRoot to stop rendering
and we could have a crash. To solve this we just have to ensure we call
removeView before cancelToast.

Bug: 31547288
Bug: 30150688
Change-Id: I96672b0ac07ff18e9f51348f2ed42913c5a5226f
2016-12-13 21:11:10 +00:00
TreeHugger Robot
6c634feae0 Merge "Fixing issue in current and max duration calculations." 2016-12-13 21:03:30 +00:00
Hakan Seyalioglu
bcbbb428e1 Merge "Don't auto-launch if switching to managed account" 2016-12-13 20:41:22 +00:00
Ivan Podogov
4460839e5c Finish resolving conflict from d23dc17
Test: Treehugger
Change-Id: If7fa9f7e300f3d810e41447369ccbbfbc3963b94
2016-12-13 20:36:04 +00:00
Eino-Ville Talvala
283ae234f9 Camera: Updates in preparation for HIDL
- For all camera2 paths, and anything shared between the legacy API and
  camera2, switch to using String for camera IDs.
- Remove assumption that camera device IDs must be a dense set of small
  integers, and rewrite the camera ID query methods
- Change operation of ICameraService.addListener: it now returns the list of
  available devices directly, instead of invoking callbacks. This is
  needed to ensure an up-to-date list of cameras is immediately available
  on connection to the camera service.
- Add new CameraStatus object to use as the addListener return value
- Update tests to work with new interface

Test: cts-tradefed run cts -m Camera --skip-connectivity-check -d -o --abi armeabi-v7a --disable-reboot
Bug: 32991422
Change-Id: I6ff4a5dd014c6aefe0750850eeece6f3267a3e5b
2016-12-13 12:12:21 -08:00
Kweku Adams
47db5a8bf7 Fixing issue in current and max duration calculations.
It looks like one operation was done out of order and some of the times used in
the calculations were leading to incorrect results.

BUG: 31023263
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsDurationTimerTest

Change-Id: I417cc28c5a55748067b6c7f682a66fe3dbc09f09
2016-12-13 19:17:44 +00:00
Vadim Tryshev
ce3264dac7 Adding public API for marking nodes as clusters and sections.
Clusters:
We need clusters to limit the size of the “tab loop” by
widgets related to the current context: working in the
app’s client area, choosing a command in the action bar
etc.

Clusters are a generalization of the current action bar’s
behavior.
An activity can have several clusters.
A cluster is a view or a view group group marked as such.
Pressing Tab loops inside the cluster, but you can exit it via
arrows.
You can teleport between clusters via special key combos.

Sections:
Sections live inside clusters.
They are needed for simplifying navigation in complex
hierarchies: instead of tabbing or arrowing, you can simply
teleport to the the next/previous section by pressing a
special key combo.
Example: think about panes in GMail app or dir/files
panels in a file manager.

Otherwise, sections are normal view groups: for example,
they don’t limit keyboard navigation in any way.

Bug: 32151632
Test: Checking for syntax errors and that Android starts.
Change-Id: Ic78495d0749db65d5177017553d37f870354c6bc
2016-12-13 11:10:51 -08:00
Michal Karpinski
cb67dc9ead Fix javadoc for PackageManager#getNameForUid()
Change-Id: Ia4fbd6948ab0703c7df9dceae99170ffb8c96ddb
2016-12-13 18:20:23 +00:00
Esteban Talavera
6c9116a643 Create DISALLOW_{ADD,REMOVE}_MANAGED_PROFILE user restrictions
Bug: 31952368

Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest    frameworks-services
Test: runtest -c com.android.server.pm.UserManagerTest frameworks-services
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.UserRestrictionsTest

Change-Id: I240ab99c2409bbabffbc574bef202f2457026905
2016-12-13 18:14:19 +00:00
Hakan Seyalioglu
7317e8abcc Don't auto-launch if switching to managed account
When the user picks the option to switch to a managed account, avoid
auto-launching the activity if there's only a single activity to pick
from.

Bug: 32669623

Test: Manual
Change-Id: Ieaed5885385929297304506ca2d5839e77043a64
2016-12-13 10:07:14 -08:00
Ivan Podogov
903d6414e5 resolve merge conflicts of b1e2da7 to nyc-mr1-dev-plus-aosp
Test: build police
Change-Id: Ifec1ab6760ebb94b0b411c9c60f07066e151206b
2016-12-13 17:55:14 +00:00
Michal Karpinski
e3639a0a07 DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
Test: the APIs will be tested by CTS when unhidden
Bug: 29748723

(cherry picked from commit da9d3ad3ac)

Change-Id: Iaff05eb6d4a2fd12e0271c703d694ecfc0dc9a17
2016-12-13 17:25:49 +00:00
Michal Karpinski
0c4ec00f85 DO NOT MERGE Fix Lint errors for network logging API
Bug: 29748723

(cherry picked from commit 0879eb41ca)

Change-Id: I187aa5b96c283323edb6a1ebe5005d70e19bf563
2016-12-13 17:25:24 +00:00