Commit Graph

301953 Commits

Author SHA1 Message Date
Chris Tate
c02a4a4613 Merge "Schedule agentDisconnected() in handler thread" 2016-11-18 01:23:31 +00:00
Michael Kwan
7e04fca2c7 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
am: 77ad3429a6  -s ours

Change-Id: I81e8e5d02c0039a9bdd2ef1632fc5f36c3ec3317
2016-11-18 01:19:15 +00:00
John Reck
e9fcf94589 Merge "Avoid starving RT anims" am: f77c220aa9 am: 7269372d5f am: 91d1bbce59
am: 39d001dff8  -s ours

Change-Id: I5b2f666a574865239dce83176a658174d0f98842
2016-11-18 00:58:31 +00:00
John Reck
39d001dff8 Merge "Avoid starving RT anims" am: f77c220aa9 am: 7269372d5f
am: 91d1bbce59

Change-Id: Ie4bf34f84a09e3147edba6ad099338fa82adc5ca
2016-11-18 00:44:26 +00:00
John Reck
91d1bbce59 Merge "Avoid starving RT anims" am: f77c220aa9
am: 7269372d5f

Change-Id: Ife1e7ea95055d8179b4a622dc4dabce382575b5b
2016-11-18 00:28:54 +00:00
Jeff Sharkey
43ca823f1a Merge "wtf() should not be fatal for core components." 2016-11-18 00:18:42 +00:00
TreeHugger Robot
d5d9469813 Merge "Correctly update database during account rename." 2016-11-18 00:18:11 +00:00
Jeff Sharkey
9ccb85d344 wtf() should not be fatal for core components.
Core system components (such as those marked as "persistent") are
aggressively restarted by the system, so crashing them as a side
effect of wtf() could easily cause system instability.

Instead, this change now treats persistent processes the same as the
system_server; we still log the wtf() event, but we don't crash
the app.

This change also causes wtf() events to be fatal on "eng" builds,
which will result in bugs being caught earlier during development
instead of later during QA testing.

Test: builds, boots, SystemUI no longer crashes
Bug: 32976626
Change-Id: Ib2d1a73379be40556f8dab5d1f15b9ed91ba7082
2016-11-17 17:15:48 -07:00
John Reck
7269372d5f Merge "Avoid starving RT anims"
am: f77c220aa9

Change-Id: I3d4ba24ae0e6de4683d47163fd8f3bf65b98bd17
2016-11-18 00:14:05 +00:00
Yifan Hong
c46d1b44eb Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: I0df309a1096b663cc51ce8badacf05e2a47836a8
2016-11-18 00:03:59 +00:00
Ricky Wai
c8fa5ed8f2 Catch KeyStoreException for setting profile lock
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.

Bug: 32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
2016-11-18 00:02:24 +00:00
Treehugger Robot
f77c220aa9 Merge "Avoid starving RT anims" 2016-11-17 23:53:00 +00:00
Michael Kwan
77ad3429a6 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.

Bug: 30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
2016-11-17 23:16:36 +00:00
Dmitry Dementyev
cf50dcf502 Correctly update database during account rename.
Bug: https://b.corp.google.com/issues/32907996

Test: Verified with CTS tests.
Change-Id: I3ef8890b9a68d17208a5681a39a0895feaff5fa1
2016-11-17 14:23:14 -08:00
John Reck
55fe2695a0 Merge "Add more complex View inflation bench" 2016-11-17 22:06:27 +00:00
John Reck
a5b7b89166 Avoid starving RT anims
Test: Manual, usleep(16000) in DrawFrameTask and tap
on recents

Merged-In: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0

Change-Id: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
2016-11-17 22:05:22 +00:00
John Reck
769ccdbc1e Merge "Avoid starving RT anims" 2016-11-17 22:03:18 +00:00
TreeHugger Robot
29993074b0 Merge "Keep track of admin actions for DO disclosures" 2016-11-17 21:40:46 +00:00
TreeHugger Robot
3613a0caee Merge "Wire up PM.getInstalledApplicationsAsUser(flags, userId) as hidden API" 2016-11-17 21:34:08 +00:00
TreeHugger Robot
b8bf61c84d Merge "Added configuration for VT downgrade/tear down when data disabled" 2016-11-17 21:05:37 +00:00
Jeff Sharkey
ff2fede0dd DO NOT MERGE: Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.

Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.

Test: builds, boots, PoC app now fails
Bug: 32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
2016-11-17 21:02:40 +00:00
Jeff Sharkey
956bc433dc DO NOT MERGE: Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.

Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.

Test: builds, boots, PoC app now fails
Bug: 32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
2016-11-17 21:02:38 +00:00
Jeff Sharkey
4ddbf942a0 DO NOT MERGE: Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.

Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.

Test: builds, boots, PoC app now fails
Bug: 32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
2016-11-17 21:02:37 +00:00
Jeff Sharkey
c813f5dae2 DO NOT MERGE: Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.

Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.

Test: builds, boots, PoC app now fails
Bug: 32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
2016-11-17 21:02:31 +00:00
Jeff Sharkey
11e3e52bd9 DO NOT MERGE: Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.

Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.

Test: builds, boots, PoC app now fails
Bug: 32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
2016-11-17 21:01:43 +00:00
Sean Stout
aaf30fb8ed Merge "Update ringtone picker strings." 2016-11-17 20:57:53 +00:00
TreeHugger Robot
8068bfeae2 Merge "Doze: Fix WakeLock bug" 2016-11-17 20:57:33 +00:00
TreeHugger Robot
5bec219934 Merge "Phase-2 API takes a hostname" 2016-11-17 20:39:54 +00:00
TreeHugger Robot
61e5f71292 Merge "Fixed NPE in ActivityStarter.updateTaskReturnToType()" 2016-11-17 20:31:53 +00:00
Adam Powell
74827260a8 Fix FragmentManager.FragmentLifecycleCallbacks scope
Static class is much more useful here.

Bug: 32938039
Test: n/a
Change-Id: I0010fde25e3b2a4f59b360c0035505c831c07c53
2016-11-17 12:20:26 -08:00
Bartosz Fabianowski
b21b241f0f Keep track of admin actions for DO disclosures
This CL adds bookkeeping to DPMS which will allow us to tell the user
in the Settings UI whether/when the admin requested a bug report or
retrieved logs from the device.

Bug: 32692748
Test: Full DevicePolicyManagerTest unit test coverage; end-to-end tests
        will follow as Settings CTS verifier tests

Change-Id: I89728fce4b7e0ff061b354c73caf3742e95a3a3e
2016-11-17 20:52:03 +01:00
Brad Ebinger
972d866b53 Merge "Readability improvements in Logging" am: d51df736f6 am: 90b6e78657 am: 3ae84b6efe
am: 75553432d4

Change-Id: Ic2a03399b6a0e8ae455d75ce134a2bb276e01c37
2016-11-17 19:51:28 +00:00
Sudheer Shanka
d9a42f2e2c Merge "Remove transaction ids in IApplicationThread." 2016-11-17 19:49:39 +00:00
Bartosz Fabianowski
1133424c2b Wire up PM.getInstalledApplicationsAsUser(flags, userId) as hidden API
Settings needs to access a variant of getInstalledApplications() which
takes a |userId| argument. Since this is not currently exposed by
PackageManager, Settings calls into PackageManagerService directly. This
is ugly and breaks the regular abstraction layer hierarchy.

The CL fixes the problem by exposing the required variant of
getInstalledApplications() as a hidden API, analogously to what was done
before with getInstalledPackages().

Bug: 32692748
Test: Will be CTS-verifier-tested together with Settings
Change-Id: Id9c4e8e18524d312159821f1a4d5527263c7e950
2016-11-17 20:49:16 +01:00
Brad Ebinger
75553432d4 Merge "Readability improvements in Logging" am: d51df736f6 am: 90b6e78657
am: 3ae84b6efe

Change-Id: I7eba86dfbf8845aae8bafddc4a6bc5f94b66bc2b
2016-11-17 19:43:08 +00:00
Brad Ebinger
3ae84b6efe Merge "Readability improvements in Logging" am: d51df736f6
am: 90b6e78657

Change-Id: I51e87f2a8146e1e60d3610bbdc791b40fc8ba972
2016-11-17 19:35:08 +00:00
Brad Ebinger
90b6e78657 Merge "Readability improvements in Logging"
am: d51df736f6

Change-Id: If7bb6955d615b8369ac41d3bb8ba96aa0cc752d2
2016-11-17 19:29:17 +00:00
Brad Ebinger
d51df736f6 Merge "Readability improvements in Logging" 2016-11-17 19:18:00 +00:00
Dimitry Ivanov
fcb4024e65 Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am: 6a5e1a7f4a am: b8e43f60c2
am: c8ff9b50ed

Change-Id: Id5eef00a490e971b025937c34b372cd272c72087
2016-11-17 19:11:20 +00:00
Derek Sollenberger
e92d4045eb Merge "Update pinImages to report when GPU resource limits are exceeded." 2016-11-17 19:08:50 +00:00
Przemyslaw Szczepaniak
167a519143 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am: caa816451c am: d771b36951 am: 728ce76156
am: ab8c119689

Change-Id: I2cd2184418b790a2ff05ca81cde7e9b373fc3b7a
2016-11-17 19:06:06 +00:00
Dimitry Ivanov
c8ff9b50ed Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am: 6a5e1a7f4a
am: b8e43f60c2

Change-Id: I449cd9a5ceabb13abce3a5d345137025fca33579
2016-11-17 19:06:02 +00:00
Pavlin Radoslavov
9cfb18a0ff Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b am: c15cc348e8 am: ffb6a4beab
am: c51275a5e5

Change-Id: I26e97c6f6f13b5b37134763f95131e184530b3ad
2016-11-17 19:03:32 +00:00
Peter Qiu
8b75eeef42 Merge "wifi: add constant definition for EAP types" am: a908e65b66 am: 40dfd2d0bc am: 120cb677f0
am: 9562122699

Change-Id: I3840e74b17bfe22b8b62597b6f98c4cee79e14f1
2016-11-17 19:02:30 +00:00
Jerry Zhang
686dcd0732 Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204 am: 1faf15d422 am: 12488ed15f
am: 5ca0000141

Change-Id: I30febc710c88d6ca02b839f5d2afc41d2f70a9b3
2016-11-17 19:01:21 +00:00
Dimitry Ivanov
b8e43f60c2 Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1
am: 6a5e1a7f4a

Change-Id: I096fb9b30c2e11bf7054aefa1bd3deb6974a9d36
2016-11-17 18:57:58 +00:00
Todd Kennedy
194e4eeb0e Phase-2 API takes a hostname
For phase-2, instead of taking a hash prefix, we will send the
hostname to the resolver.

Bug: 25119046
Test: build & install the sample resolver and run 'adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d "https://www.tripadvisor.com/Tourism-g33020-San_Jose_California-Vacations.html"'
Change-Id: I6e621139e182f9a9cfcf608c26d4763f1379bdb2
2016-11-17 10:56:37 -08:00
Dimitry Ivanov
6a5e1a7f4a Merge "Fix coretests: Remove dependency on libnativehelper"
am: f68cb55cc1

Change-Id: I06e1b8acbe6772ea80bb9c6ab6704e6ce678c3cc
2016-11-17 18:50:29 +00:00
Jerry Zhang
4c4666c5ef Merge commit '54f33d9af22e62629798555a3cde4e784bd8ba54' into manual_merge_54f33d9
Change-Id: Icfd9bc3eff034d33e733dbb8386949c9ec345e58
2016-11-17 10:48:26 -08:00
Jack Yu
2030cd9f5f Added configuration for VT downgrade/tear down when data disabled
Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

Test: telephony unit tests
bug: 32880745
Change-Id: Idd33a022b5a31cbc58592587bcb496bd78923ae7
2016-11-17 10:42:02 -08:00