OSDN Git Service
TreeHugger Robot [Thu, 22 Feb 2018 19:58:38 +0000 (19:58 +0000)]
Merge "Split query permission from update permission"
Mathew Inwood [Thu, 22 Feb 2018 19:26:19 +0000 (19:26 +0000)]
Merge "Populate hiddenapi whitelist." am:
2519de11c3 am:
37d670a083
am:
ca7e42317f
Change-Id: I9549a42daaf469d286b92b249881838b3a50fab6
Selim Cinek [Thu, 22 Feb 2018 19:20:47 +0000 (19:20 +0000)]
Merge "Fixed a NP when replying to a message"
Yahan Zhou [Thu, 22 Feb 2018 19:17:49 +0000 (19:17 +0000)]
Merge "Start UsbService in emulator"
Jeff Sharkey [Thu, 22 Feb 2018 19:10:24 +0000 (19:10 +0000)]
Merge "NetworkCapabilities needs UID to be satisfied."
Mathew Inwood [Thu, 22 Feb 2018 19:05:33 +0000 (19:05 +0000)]
Merge "Populate hiddenapi whitelist." am:
2519de11c3
am:
37d670a083
Change-Id: Ic859a5b988ad88430c95590e10439f24f2dfecea
TreeHugger Robot [Thu, 22 Feb 2018 19:02:27 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Mathew Inwood [Thu, 22 Feb 2018 18:56:44 +0000 (18:56 +0000)]
Merge "Populate hiddenapi whitelist."
am:
2519de11c3
Change-Id: I0b6139661f07352acdbd62a83cff2bba2b667b9b
Chong Zhang [Fri, 16 Feb 2018 19:57:09 +0000 (11:57 -0800)]
MediaMuxer: clear file content when writing to existing file
bug:
73546869
Change-Id: I7f38ecef1035f1190effae38634d21a3a18cc09f
TreeHugger Robot [Thu, 22 Feb 2018 18:49:15 +0000 (18:49 +0000)]
Merge "Start target package by binding to Service, not starting Activity"
TreeHugger Robot [Thu, 22 Feb 2018 18:34:37 +0000 (18:34 +0000)]
Merge "DisplayCutout: Cache inflations from resources"
Jeff Sharkey [Thu, 22 Feb 2018 18:19:06 +0000 (18:19 +0000)]
Merge "More consistent controller logging."
TreeHugger Robot [Thu, 22 Feb 2018 18:13:42 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 22 Feb 2018 18:08:59 +0000 (18:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Gus Prevas [Thu, 22 Feb 2018 18:06:54 +0000 (18:06 +0000)]
Merge "Deprecates methods on WearableExtender.Builder which have not been honored since Wear 1.0."
TreeHugger Robot [Thu, 22 Feb 2018 18:01:42 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Selim Cinek [Thu, 22 Feb 2018 17:39:41 +0000 (09:39 -0800)]
Fixed a NP when replying to a message
The visbilityChanged listener is only set up later,
so we'll have to add a nullcheck for it.
Change-Id: I1f5843f02fd9c8fc20e26f1de47911e5eb533471
Fixes:
73758799
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java
Mathew Inwood [Thu, 22 Feb 2018 17:36:20 +0000 (17:36 +0000)]
Merge "Populate hiddenapi whitelist."
Wale Ogunwale [Thu, 22 Feb 2018 17:20:44 +0000 (17:20 +0000)]
Merge "Fixed issue with relaunching activity in the stopped state"
Jeff Davidson [Thu, 22 Feb 2018 16:48:53 +0000 (16:48 +0000)]
Merge "Factor out telephony permission checks into a helper class."
TreeHugger Robot [Thu, 22 Feb 2018 16:41:31 +0000 (16:41 +0000)]
Merge "New small volume dialog"
Robert Berry [Thu, 22 Feb 2018 16:40:12 +0000 (16:40 +0000)]
Merge "Remove package name parameter from setRecoveryStatus"
Makoto Onuki [Thu, 22 Feb 2018 16:37:30 +0000 (16:37 +0000)]
Merge "Implement UNLIMITED_SHORTCUTS_API_CALLS permission."
Paul Duffin [Thu, 22 Feb 2018 16:27:28 +0000 (16:27 +0000)]
Merge changes I8e432950,Id325b8cf am:
919ff2268b am:
9eec0a5c0e
am:
cb77fb7c9a -s ours
Change-Id: I2625d4a671a6a50f99ab99ffd72b96b83c601538
Jorim Jaggi [Thu, 22 Feb 2018 16:13:44 +0000 (16:13 +0000)]
Merge "Fix task animations"
Jorim Jaggi [Thu, 22 Feb 2018 16:10:56 +0000 (16:10 +0000)]
Merge "Add ability to show wallpaper during animation"
TreeHugger Robot [Thu, 22 Feb 2018 16:08:51 +0000 (16:08 +0000)]
Merge "Make default entity lists flag configurable"
Mathew Inwood [Thu, 22 Feb 2018 16:02:50 +0000 (16:02 +0000)]
Merge "Package whitelist for hiddenapi checks." am:
9a50d75795 am:
3d2a3e25d3
am:
60b6925bdb -s ours
Change-Id: Icc96c28fd9289268398c71f82ac83038a606550d
Pengquan Meng [Thu, 22 Feb 2018 15:53:27 +0000 (15:53 +0000)]
Merge "Cleanup TelephonyManager's log" am:
033de4676b am:
22f61111bd
am:
bfb00f97af
Change-Id: Iccc3d497bf28906f4da54eef3acbd72dc04bfd3c
Hall Liu [Thu, 22 Feb 2018 15:38:26 +0000 (15:38 +0000)]
Merge "EMBMS API tweaks" am:
47e1d11b47 am:
3b40c709a3
am:
2a08ccdd8b
Change-Id: I617e2bca44d52b55f2d032db0fe59aa0a9f88e24
Paul Duffin [Thu, 22 Feb 2018 15:26:08 +0000 (15:26 +0000)]
Merge changes I8e432950,Id325b8cf am:
919ff2268b
am:
9eec0a5c0e
Change-Id: Ie067d44d602ecaf13fd5ea1101b87807193733e9
Paul Duffin [Thu, 22 Feb 2018 15:16:30 +0000 (15:16 +0000)]
Merge changes I8e432950,Id325b8cf
am:
919ff2268b
Change-Id: I0912e9a426a5cc72e67b3ec55e2bbe195079eaf6
TreeHugger Robot [Thu, 22 Feb 2018 15:14:38 +0000 (15:14 +0000)]
Merge "Build android.test.runner and its variants with SDK"
Julia Reynolds [Wed, 21 Feb 2018 16:41:33 +0000 (11:41 -0500)]
New small volume dialog
- Remove labels
- Remove output chooser dialog
- Reorder icons
- Add settings affordance
- Add instructive toast
Test: manual
Change-Id: I6640fb8147707936fe22e3c756ab29116973fbe3
Fixes:
73719758
Fixes:
73333233
Fixes:
71663761
TreeHugger Robot [Thu, 22 Feb 2018 14:36:05 +0000 (14:36 +0000)]
Merge "Docs: small documentation fixes for formatting and typos."
Mathew Inwood [Thu, 22 Feb 2018 14:29:23 +0000 (14:29 +0000)]
Merge "Package whitelist for hiddenapi checks." am:
9a50d75795
am:
3d2a3e25d3
Change-Id: I8e0120c77965a3d5784e61c7eabe5a8c4f88b1ea
Jorim Jaggi [Wed, 21 Feb 2018 17:46:53 +0000 (18:46 +0100)]
Fix task animations
Sometimes apps are using trampoline activities in the current
task, and then open a new task from that trampoline activity,
which means that the first transition was ACTIVITY_OPEN and that's
what we take at end.
To fix this, we let task animations always override activity
animations.
Test: go/wm-smoke
Test: Open a Docs document from Drive. Open a Chrome link from
Maps.
Fixes:
72710883
Change-Id: I72b6901fdc21514ffca4a47e433d66ea9d3cdb32
Mathew Inwood [Thu, 22 Feb 2018 14:11:57 +0000 (14:11 +0000)]
Merge "Package whitelist for hiddenapi checks."
am:
9a50d75795
Change-Id: Iad8ccab4d46677320c9d39f73e6bbc67262c18b2
Benjamin Franz [Thu, 22 Feb 2018 14:08:33 +0000 (14:08 +0000)]
Merge "Update lock task features name and javadoc"
Wale Ogunwale [Wed, 21 Feb 2018 02:18:21 +0000 (18:18 -0800)]
Fixed issue with relaunching activity in the stopped state
- Cycle activity back to the stopped state if relaunched while the
activity is in the stopped state.
- Also, process Activity.recreate() request locally. After the
activity life cycler changes/clean-up we no longer need to request
the relaunch from the server since it is much easier now to cycle
the activity back to its previous state without help from the server
side.
Change-Id: Ie63420361a50d3dee2cbbcc2bbd34f3099c93996
Fixes:
64610483
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests
Jorim Jaggi [Wed, 21 Feb 2018 16:50:18 +0000 (17:50 +0100)]
Add ability to show wallpaper during animation
In the new task switch animations, we'd like to show the wallpaper
behind. For that, we add the ability to show the wallpaper for
any animation via Animation.showWallpaper as an XML attribute.
If the window of an app is animating, and the animation requests
the wallpaper, it can also be a wallpaper.
One remaning issue here is that we don't wait for the wallpaper
to be drawn when waiting for the transition. However, usually this
isn't an issue because the wallpaper is drawn in any case.
To fix this we'd need to load the animation already and then make
it a target before the animation starts, which is a bit involved
/quirky.
Test: Open/close task, observe wallpaper behind
Test: go/wm-smoke
Bug:
72396815
Change-Id: I676273a4e6627f8b5e0a1366fcd80a7c92018123
Treehugger Robot [Thu, 22 Feb 2018 13:39:10 +0000 (13:39 +0000)]
Merge changes I8e432950,Id325b8cf
* changes:
Build android.test.base/legacy against SDK
Fix visibility issues with android.test.mock.stubs
Mathew Inwood [Thu, 22 Feb 2018 12:57:48 +0000 (12:57 +0000)]
Merge "Package whitelist for hiddenapi checks."
Bill Yi [Thu, 22 Feb 2018 12:29:54 +0000 (04:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: If342c295e2b514414c1540673c7ffcf85d60b83e
Auto-generated-cl: translation import
Adrian Roos [Wed, 21 Feb 2018 14:17:07 +0000 (15:17 +0100)]
DisplayCutout: Cache inflations from resources
Caches inflations from resources if the parameters did not
change. This increases the hitrate of the rotation variants
cache in window manager, and avoids unnecessairy reinflations
whenever the display changes.
Change-Id: I2ed9a2c259158bf1a6b551b3422534efbfec99c9
Bug:
72444324
Test: atest DisplayCutoutTest
Annie Meng [Thu, 22 Feb 2018 12:22:42 +0000 (12:22 +0000)]
Merge "Add TestApis for updateTransportAttributes GTS tests"
Mihai Popa [Thu, 22 Feb 2018 12:03:01 +0000 (12:03 +0000)]
Merge changes from topic "magnifier_sync_movement"
* changes:
[Magnifier-24] Add completion callback TestApi
[Magnifier-21] Rate-limit drawings to renderer
[Magnifier-20] Raw Surface instead of PopupWindow
TreeHugger Robot [Thu, 22 Feb 2018 12:02:38 +0000 (12:02 +0000)]
Merge "Update javadoc of PackageInstaller to mention the enterprise bit"
Jan Althaus [Mon, 19 Feb 2018 10:44:37 +0000 (11:44 +0100)]
Make default entity lists flag configurable
Bug:
73277686
Test: bit CtsViewTestCases:android.view.textclassifier.cts
CtsTextTestCases:android.text.util.cts
FrameworksCoreTests:android.view.textclassifier
Change-Id: I84be54fb407088ee25c3ba2d4d62708a898621ad
TreeHugger Robot [Thu, 22 Feb 2018 11:31:29 +0000 (11:31 +0000)]
Merge "Adding logging for generateLinks"
Mathew Inwood [Fri, 16 Feb 2018 13:32:19 +0000 (13:32 +0000)]
Populate hiddenapi whitelist.
This list of packages is derived from all packages in the tree that do not
specify LOCAL_SDK_VERSION in their Android.mk. It was done by:
1. Modifying biuld/core/package_internal.mk to output a warning for all
packages that do not specify LOCAL_SDK_VERSION, including some
metadata about the target.
2. Parsing the output fom the build, then filtering out those that specify
a test certificate, or with LOCAL_MODULE_TAGS := tests, that depend
on android.test.runner or whose name includes "Test"
3. Look up the java package name of each & build the list from these.
Test: N/A, this change is a no-op while all system apps are excluded
from the checks.
BUG:
73244707
Change-Id: Ie3dcb1b4b83c32e93609bc58dc7a1cd513eeea64
Mathew Inwood [Fri, 16 Feb 2018 11:49:20 +0000 (11:49 +0000)]
Package whitelist for hiddenapi checks.
Some packages in the system image are not built against the SDK, so
enforcing hiddenapi checks for these will break them. Add a whitelist
for such packages.
For now, just add the contacts provider to the whitelist. The list will be
further populated later.
Test: Added test app package name to whitelist to verify.
Bug:
73244707
Merged-In: I94746b7f12dd9371d5068bb235eb853f63ee4d97
Change-Id: I1cbbd220c61b1b4b767c301f97096607ee902a7b
Bill Yi [Thu, 22 Feb 2018 10:56:20 +0000 (02:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5b822189f2a536e571345a6f761015f0f56a19b3
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Feb 2018 10:51:23 +0000 (02:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5e802dd35bdf7548912f96fed27f7bd48c2216b5
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Feb 2018 10:45:38 +0000 (02:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I899af9662533764d6efb2186c1efe5bfbcb6807e
Auto-generated-cl: translation import
Robert Berry [Tue, 20 Feb 2018 19:47:43 +0000 (19:47 +0000)]
Remove package name parameter from setRecoveryStatus
Package name is implicit. Recovery agent can only act for the same uid.
Bug:
73757432
Test: runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore
Change-Id: I45abf4b956fa4e97d981614d9e61295e85d5669e
Jaewan Kim [Thu, 22 Feb 2018 09:55:21 +0000 (09:55 +0000)]
Merge "MediaSessionService: Document necessity of onSessionDestroyed()"
TreeHugger Robot [Thu, 22 Feb 2018 09:37:57 +0000 (09:37 +0000)]
Merge "Camera: improve Surface equality check"
Benjamin Miller [Thu, 22 Feb 2018 08:49:21 +0000 (08:49 +0000)]
Docs: small documentation fixes for formatting and typos.
Test: make ds-docs
Bug:
73753042
Change-Id: Iaf8065de45b03a59e1327d3872bb790da276d230
Pengquan Meng [Thu, 22 Feb 2018 07:14:43 +0000 (07:14 +0000)]
Merge "Cleanup TelephonyManager's log" am:
033de4676b
am:
22f61111bd
Change-Id: Icaff0e2cc4ebeb1f36b8597ee11457779aeca06f
Pengquan Meng [Thu, 22 Feb 2018 07:02:54 +0000 (07:02 +0000)]
Merge "Cleanup TelephonyManager's log"
am:
033de4676b
Change-Id: I808ab4b142afcbf6c752b7f4f24d60500ab1cb51
TreeHugger Robot [Thu, 22 Feb 2018 06:40:03 +0000 (06:40 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 22 Feb 2018 05:36:45 +0000 (05:36 +0000)]
Merge "Add annotation to atoms that represent a state change in atoms.proto"
Pengquan Meng [Thu, 22 Feb 2018 05:19:11 +0000 (05:19 +0000)]
Merge "Cleanup TelephonyManager's log"
Jiyong Park [Thu, 22 Feb 2018 05:16:35 +0000 (14:16 +0900)]
Build android.test.runner and its variants with SDK
They are not using any private APIs, thus eligible to be built with SDK.
Test: m -j
Change-Id: I82c7e2a739a40d6d2f1488164b25503a8a454b0d
TreeHugger Robot [Thu, 22 Feb 2018 04:30:27 +0000 (04:30 +0000)]
Merge "Rename HardwareLayer -> TextureLayer"
TreeHugger Robot [Thu, 22 Feb 2018 04:08:02 +0000 (04:08 +0000)]
Merge "WebView: fix docs for setSafeBrowsingWhitelist"
TreeHugger Robot [Thu, 22 Feb 2018 04:01:25 +0000 (04:01 +0000)]
Merge "Updates the name of the native library wrapper class, adds options and removes hints."
Mike Digman [Thu, 22 Feb 2018 03:55:10 +0000 (03:55 +0000)]
Merge "Update rotate suggestion button icon+motion"
Hall Liu [Thu, 22 Feb 2018 03:54:18 +0000 (03:54 +0000)]
Merge "EMBMS API tweaks" am:
47e1d11b47
am:
3b40c709a3
Change-Id: I8b281f717d3862a9f7a5de3d834dcded4ac436dc
Hall Liu [Thu, 22 Feb 2018 03:36:12 +0000 (03:36 +0000)]
Merge "EMBMS API tweaks"
am:
47e1d11b47
Change-Id: Ie058b45f2dd09b80a51cb9702155e45f49005173
Jeff Sharkey [Thu, 22 Feb 2018 03:27:48 +0000 (20:27 -0700)]
NetworkCapabilities needs UID to be satisfied.
A recently added NetworkCapabilities feature expects that a
NetworkRequest defines a real UID in order for it to be satisfied
by a VPN-based network.
So when creating our JobStatus inside the system (either from a new
external request, or from a persisted job on disk), splice in the
source UID of the job, so that VPNs start matching.
Test: bit CtsJobSchedulerTestCases:*
Bug:
72765718,
73418534
Change-Id: Id611a98fee8f53cea92f7a22ec02f7f6d8a4c534
Jeff Sharkey [Thu, 22 Feb 2018 03:12:40 +0000 (20:12 -0700)]
More consistent controller logging.
Unify behind a single strategy that allows us to enable specific
controllers (or everything) via setprop for debugging.
Test: builds, boots
Bug:
73019091
Change-Id: I039a0b722c3da2c38d2ea64932b31281d85eab1a
TreeHugger Robot [Thu, 22 Feb 2018 03:13:04 +0000 (03:13 +0000)]
Merge "Statsd anomaly output log fix"
John Reck [Thu, 22 Feb 2018 02:28:40 +0000 (02:28 +0000)]
Merge "Handle window surface insets"
TreeHugger Robot [Thu, 22 Feb 2018 02:17:34 +0000 (02:17 +0000)]
Merge "Fix the bug of timestamp encoding in event metric report."
TreeHugger Robot [Thu, 22 Feb 2018 02:14:07 +0000 (02:14 +0000)]
Merge "Add 90th and 95th percentile to ManualBenchmarkState"
Arthur Eubanks [Tue, 13 Feb 2018 18:20:39 +0000 (10:20 -0800)]
Start target package by binding to Service, not starting Activity
This reduces the stddev for a bunch of perf tests by quite a bit
(mostly the ones that rely on starting the package).
This is because previously the target
package was made to start running by starting an Activity, which takes
up CPU cycles.
Now we start a Service and wait for it to report back that its Looper
queue is idle, then proceed.
This does seem to slightly increase the runtime for some of the tests
though...
Some test numbers (only tests that have a large difference before and
after):
Before:
registeredBroadcast_mean=
1920309
registeredBroadcast_median=
1724844
registeredBroadcast_stddev=559809
manifestBroadcastRunning_mean=
2395693
manifestBroadcastRunning_median=
2063385
manifestBroadcastRunning_stddev=809836
contentProviderRunning_mean=668463
contentProviderRunning_median=588125
contentProviderRunning_stddev=214116
bindServiceAllowOomManagement_mean=
1952431
bindServiceAllowOomManagement_median=
2017682
bindServiceAllowOomManagement_stddev=289311
bindServiceAlreadyBound_mean=
2146257
bindServiceAlreadyBound_median=
2022891
bindServiceAlreadyBound_stddev=614549
bindServiceRunning_mean=
4947541
bindServiceRunning_median=
4710521
bindServiceRunning_stddev=962094
startServiceProcessRunningReadUriPermission_mean=
1914106
startServiceProcessRunningReadUriPermission_median=
1915209
startServiceProcessRunningReadUriPermission_stddev=196136
startServiceProcessRunning_mean=
2841122
startServiceProcessRunning_median=
2564792
startServiceProcessRunning_stddev=684654
After:
registeredBroadcast_mean=
2559587
registeredBroadcast_median=
2579792
registeredBroadcast_stddev=191377
manifestBroadcastRunning_mean=
2709707
manifestBroadcastRunning_median=
2725365
manifestBroadcastRunning_stddev=165661
contentProviderRunning_mean=663058
contentProviderRunning_median=639062
contentProviderRunning_stddev=97864
bindServiceAllowOomManagement_mean=
1899179
bindServiceAllowOomManagement_median=
1932553
bindServiceAllowOomManagement_stddev=184329
bindServiceAlreadyBound_mean=
2023920
bindServiceAlreadyBound_median=
2051614
bindServiceAlreadyBound_stddev=159993
bindServiceRunning_mean=
6683975
bindServiceRunning_median=
6753699
bindServiceRunning_stddev=475811
startServiceProcessRunningReadUriPermission_mean=
2388997
startServiceProcessRunningReadUriPermission_median=
2405365
startServiceProcessRunningReadUriPermission_stddev=244184
startServiceProcessRunning_mean=
3384101
startServiceProcessRunning_median=
3388282
startServiceProcessRunning_stddev=207333
Test: m ActivityManagerPerfTestsTestApp ActivityManagerPerfTests
Test: adb install \
$OUT/data/app/ActivityManagerPerfTestsTestApp/ActivityManagerPerfTestsTestApp.apk
Test: adb install \
$OUT/data/app/ActivityManagerPerfTests/ActivityManagerPerfTests.apk
Test: adb shell am instrument -w \
com.android.frameworks.perftests.amtests/android.support.test.runner.AndroidJUnitRunner
BUG:
67460485
Change-Id: Iaaaf7d8db885cc1149e74cb7ce4b47a295ab20e4
Bill Yi [Thu, 22 Feb 2018 01:35:18 +0000 (17:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I40b6e489f9b5e97da095ae0d4258de9df1565736
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 22 Feb 2018 01:26:09 +0000 (01:26 +0000)]
Merge "Binary Cpu Time Proc File Reader"
TreeHugger Robot [Thu, 22 Feb 2018 01:11:00 +0000 (01:11 +0000)]
Merge "Throttler for incidentd based on size putting into dropbox."
Sundeep Ghuman [Thu, 22 Feb 2018 00:55:07 +0000 (00:55 +0000)]
Merge "Fix tests broken in ag/
3574286"
Yao Chen [Mon, 19 Feb 2018 22:39:19 +0000 (14:39 -0800)]
Add annotation to atoms that represent a state change in atoms.proto
+ A state change atom can have one exclusive state field, and any
number of primary key fields.
When there is primary key in the atom, it means the state belongs to the primary key.
For example,
message UidProcessStateChanged {
optional int32 uid = 1 [(stateFieldOption).option = PRIMARY];
optional android.app.ProcessStateEnum state = 2 [(stateFieldOption).option = EXCLUSIVE];
}
When there is no primary key fields in the atom, the state is global.
For example,
message ScreenStateChanged {
optional android.view.DisplayStateEnum state = 1 [(stateFieldOption).option = EXCLUSIVE];
}
+ The annotation is consumed by stats_log_api_gen to generate a static map from the state
atoms to its primary fields, and exclusive fields
+ stats_log.proto is splitted into 2 proto files, because statsd needs proto lite, and c++
lite proto library cannot properly ignore the field options which requires full proto.
This CL doesn't change any logic in the statsd yet. A separate CL will use the field option
information to correctly track the state.
Test: added unit tests in stats_log_api_gen_test. and statsd_test pases.
Change-Id: I9e8a979fe81ba60efd4d854bb7087ce4b2b147ec
Sundeep Ghuman [Wed, 21 Feb 2018 22:17:57 +0000 (14:17 -0800)]
Fix tests broken in ag/
3574286
Changes made during review process broke a test, and this was not caught
via presubmits. Fixing now.
Bug:
68030053
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I7ce84c7cd1653966beb8980250e64a590def7fc9
Android Build Merger (Role) [Thu, 22 Feb 2018 00:44:42 +0000 (00:44 +0000)]
Merge "Merge "Check for location access on TelephonyRegistry" am:
31230bb193 am:
f581580fdb am:
9b31dd86da"
Hall Liu [Thu, 22 Feb 2018 00:43:12 +0000 (00:43 +0000)]
Merge "Check for location access on TelephonyRegistry" am:
31230bb193 am:
f581580fdb
am:
9b31dd86da
Change-Id: Icd2feab82a9350fa2b6539617863ad91a44e5208
TreeHugger Robot [Thu, 22 Feb 2018 00:40:52 +0000 (00:40 +0000)]
Merge "Add Hearing Aid output device"
Makoto Onuki [Thu, 22 Feb 2018 00:40:32 +0000 (00:40 +0000)]
Merge "Fix comment on config_defaultTextClassifierPackage"
Hall Liu [Thu, 22 Feb 2018 00:35:51 +0000 (00:35 +0000)]
Merge "EMBMS API tweaks"
Android Build Merger (Role) [Thu, 22 Feb 2018 00:35:04 +0000 (00:35 +0000)]
Merge "Merge "Explicitly restart the killed wallpaper service" am:
0780b18a9f am:
9298af376a am:
c5d4747494"
Chris Tate [Thu, 22 Feb 2018 00:34:45 +0000 (00:34 +0000)]
Merge "Explicitly restart the killed wallpaper service" am:
0780b18a9f am:
9298af376a
am:
c5d4747494
Change-Id: I6f9d38268320095ba69bfa490fcdf4dadd173fe8
Hall Liu [Thu, 22 Feb 2018 00:34:03 +0000 (00:34 +0000)]
Merge "Check for location access on TelephonyRegistry" am:
31230bb193
am:
f581580fdb
Change-Id: Ic13eacf7dafc96359bd607cb4e2a5c024f9bb607
TreeHugger Robot [Thu, 22 Feb 2018 00:33:42 +0000 (00:33 +0000)]
Merge "Handling concurrent location & SV status update"
Yin-Chia Yeh [Wed, 21 Feb 2018 20:38:19 +0000 (12:38 -0800)]
Camera: improve Surface equality check
Bug:
72134091 73711267
Change-Id: I0d7b42f8621c1fb19ad9645d8b407eb90b05654d
Chris Tate [Thu, 22 Feb 2018 00:16:40 +0000 (00:16 +0000)]
Merge "Explicitly restart the killed wallpaper service" am:
0780b18a9f
am:
9298af376a
Change-Id: If3cd3217c2d9f42772e0f276c1bc3c1380ac149f
Hall Liu [Thu, 22 Feb 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Check for location access on TelephonyRegistry"
am:
31230bb193
Change-Id: I6827b337d9bcc2c634d873e03895c5997cca374c
Chris Tate [Thu, 22 Feb 2018 00:06:25 +0000 (00:06 +0000)]
Merge "Explicitly restart the killed wallpaper service"
am:
0780b18a9f
Change-Id: I7759fc380ef9555cb58f9ab593248e69cd798c70
Jakub Pawlowski [Wed, 21 Feb 2018 19:53:14 +0000 (11:53 -0800)]
Add Hearing Aid output device
This output is used to send audio to Hearring Aid device.
Bug:
69623109
Test: mm
Change-Id: I6ffdb0a404efb645592624612c7ebc187fb933a6
Yahan Zhou [Wed, 15 Mar 2017 23:04:58 +0000 (16:04 -0700)]
Start UsbService in emulator
We need to start usb service in emulator even when we do not have usb
feature. It is used for adb authentication.
BUG:
73644752
Test: manual
Change-Id: I7ac6c5a20777be5ab5f286a02b73211b5e76898d
(cherry picked from commit
dfe6a40d8a8d4806d77773961e137edb1fbcbb0e)
John Reck [Wed, 21 Feb 2018 20:55:41 +0000 (12:55 -0800)]
Rename HardwareLayer -> TextureLayer
Update name to reflect meaning/usage
Change-Id: Iddb3621cbca147f96faa83380867baa49c382aab
Fixes:
20461288
Test: builds & boots