OSDN Git Service
Erik Kline [Tue, 7 Nov 2017 06:23:05 +0000 (06:23 +0000)]
Merge "Replace dns_tls with private_dns_mode setting" am:
8cf645c04d am:
f1799116c2
am:
76d2732ad8
Change-Id: Icba28e4d4e446dd6eac0f2f017957894e33084f2
Erik Kline [Tue, 7 Nov 2017 06:12:39 +0000 (06:12 +0000)]
Merge "Replace dns_tls with private_dns_mode setting" am:
8cf645c04d
am:
f1799116c2
Change-Id: I3e0448c045eb1072d0cd70a163ca355786b21cc4
Erik Kline [Tue, 7 Nov 2017 06:03:01 +0000 (06:03 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
am:
8cf645c04d
Change-Id: I421a750561ddde0afc6a70ba6369c83ab2e33571
Treehugger Robot [Tue, 7 Nov 2017 05:54:29 +0000 (05:54 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
Neil Fuller [Tue, 7 Nov 2017 05:42:12 +0000 (05:42 +0000)]
Change SystemApi as per API council feedback am:
a9dc4456f7
am:
c38df28c41
Change-Id: Iec0a8981ed6beef9e29e6a00781681614a5b1809
Neil Fuller [Tue, 7 Nov 2017 05:34:15 +0000 (05:34 +0000)]
Change SystemApi as per API council feedback
am:
a9dc4456f7
Change-Id: Iae3b822e08c49affc6a735adfe0fff1400b798eb
TreeHugger Robot [Tue, 7 Nov 2017 05:25:45 +0000 (05:25 +0000)]
Merge changes from topic "mediarouter_fix"
* changes:
AudioPlayerStateMonitor: fix NPE
Revert "Revert "Fix overactive media routing""
Neil Fuller [Fri, 11 Aug 2017 12:22:36 +0000 (13:22 +0100)]
Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.
This is the first of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the
constant.
Bug:
64568899
Test: None, build only
Change-Id: Ib9766591979886d1db3b1d7321536dabf5cf81a8
(cherry picked from commit
8bb4140516c0e18d6c3cbb4215cedc306a2a6da9)
TreeHugger Robot [Tue, 7 Nov 2017 04:39:36 +0000 (04:39 +0000)]
Merge "Remove libmedia_omx_defaults from libmedia"
Erik Kline [Mon, 30 Oct 2017 06:29:44 +0000 (15:29 +0900)]
Replace dns_tls with private_dns_mode setting
Also includes:
- SettingsLib strings used in PrivateDnsModeDialogPreference
interaction in the Settings app
- rename ContentResolver "resolver" in methods working with
DNS resolvers (too confusing)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
- no new failures in SettingsBackupTest nor in SettingsProviderTest
- manual interaction with developer option works
Bug:
34953048
Bug:
64133961
Change-Id: Ia7502916db9ffa0792e1e500a35e34d06a88e79d
TreeHugger Robot [Tue, 7 Nov 2017 03:17:12 +0000 (03:17 +0000)]
Merge changes I3afc0622,I25723107
* changes:
Make DragDropController#mDragState private
Sort out various cleanup methods of DragState
TreeHugger Robot [Tue, 7 Nov 2017 03:05:58 +0000 (03:05 +0000)]
Merge "Add unit tests for CountMetricProducer, EventMetricProducer"
Jae Shin [Mon, 30 Oct 2017 05:50:52 +0000 (14:50 +0900)]
Remove libmedia_omx_defaults from libmedia
libmedia_omx_defaults includes source files and this default was
used in both libmedia.so and libmedia_omx.so. This is an issue because
libmedia_omx and libmedia are both loaded in the framework process
through dependency chains such as libstagefright ->
libstagefright_omx_utils -> libmedia_omx.
To fix the issue, libmedia_omx_defaults is removed from libmedia and
libmedia now depends on libmedia_omx. Other modules/libs that originally
depended on libmedia and need access to libmedia_omx_defaults' source
files, now depend on libmedia_omx as well.
Bug:
67871061
Test: mma -j and boot test
Change-Id: I096d58d1e3338b70d5dae9d0f9919b908070d071
Eric Laurent [Wed, 1 Nov 2017 18:43:02 +0000 (11:43 -0700)]
AudioPlayerStateMonitor: fix NPE
Use PLAYER_STATE_UNKNOWN for state passed to
sendAudioPlayerStateChangedMessageLocked() when prevState
is null in dispatchPlaybackConfigChange()
Bug:
68748062
Test: receive a call and check ringtone
Test: passed media cts
Change-Id: I9d4c84dc1d79a72afd06d044d00f682b70c86255
TreeHugger Robot [Tue, 7 Nov 2017 02:40:35 +0000 (02:40 +0000)]
Merge "Fix robolectric test failure in settings"
Sungsoo Lim [Fri, 3 Nov 2017 02:22:35 +0000 (02:22 +0000)]
Revert "Revert "Fix overactive media routing""
This reverts commit
0aec178b7e66a29a22e90415faa15fb5f01aaef2.
Bug:
65376604
Test: manual and media cts
Change-Id: Ifd20848b406a1c51356c0b852274ba85b7062fdc
TreeHugger Robot [Tue, 7 Nov 2017 02:39:47 +0000 (02:39 +0000)]
Merge "Sim Pin layout fixes"
TreeHugger Robot [Tue, 7 Nov 2017 02:37:13 +0000 (02:37 +0000)]
Merge "Fixed the textalignment for buttons"
TreeHugger Robot [Tue, 7 Nov 2017 02:29:16 +0000 (02:29 +0000)]
Merge "SidekickService (base)"
Neil Fuller [Tue, 7 Nov 2017 02:14:58 +0000 (02:14 +0000)]
Add TimeZoneRulesDataContract to system API am:
0ab8a0d27b
am:
279828df0e
Change-Id: I3341b71fc2175f4b5916fb18deaed64b2660a0c1
Neil Fuller [Tue, 7 Nov 2017 02:05:44 +0000 (02:05 +0000)]
Add TimeZoneRulesDataContract to system API
am:
0ab8a0d27b
Change-Id: I94ad4699cc6afb98157fe7d295e9ec502a2d7d14
TreeHugger Robot [Tue, 7 Nov 2017 01:39:06 +0000 (01:39 +0000)]
Merge "BatteryService: Clean up init logic."
Yao Chen [Thu, 2 Nov 2017 20:52:59 +0000 (13:52 -0700)]
Add unit tests for CountMetricProducer, EventMetricProducer
And other miscellaneous fixes.
+ clang-format
+ 2 bug fixes, one in dump-report command, one in ResourcePowerManagerPuller
Test: statsd_test
Change-Id: Ibd164d948ad62adcc529d813df1210781e38be47
Neil Fuller [Mon, 3 Jul 2017 13:38:50 +0000 (14:38 +0100)]
Add TimeZoneRulesDataContract to system API
Add TimeZoneRulesDataContract to system API and remove
TODOs to add other classes that should not now be needed
in the system API (since they are used by a platform-only
app).
Bug:
31008728
Test: make droid
Change-Id: I600e7b08853b86b27463193411cf85207ae09ce8
Selim Cinek [Tue, 7 Nov 2017 00:57:48 +0000 (16:57 -0800)]
Fixed the textalignment for buttons
In RTL we should still layout the buttons according
to the viewStart instead of using the text-based alignment.
This will make the layout look consistent overall.
Change-Id: Ied04e0f6856f0ee7028dbab6d0bdc28f1bc80f6b
Fixes:
67650712
Test: manual, add notification with multiple actions, force RTL
Jordan Liu [Tue, 7 Nov 2017 00:58:26 +0000 (00:58 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat" am:
e158cdaaa5 am:
909a889436
am:
1c664d0b8e
Change-Id: I7e1a31f1e1ea45de09e5aa610c8fc79ce01495f0
Jordan Liu [Tue, 7 Nov 2017 00:33:20 +0000 (00:33 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat" am:
e158cdaaa5
am:
909a889436
Change-Id: I24c1b7009f54b20ba5231a81ecf67150f7345df1
Jordan Liu [Tue, 7 Nov 2017 00:20:00 +0000 (00:20 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat"
am:
e158cdaaa5
Change-Id: I7ce73ab2a139b299de806f9d856544a382fe69e0
Jordan Liu [Tue, 7 Nov 2017 00:07:11 +0000 (00:07 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat"
George Burgess IV [Mon, 6 Nov 2017 23:56:54 +0000 (23:56 +0000)]
Merge "cmds: add #!s" am:
8911c35df3 am:
2c61e3de27
am:
4037fe04d2
Change-Id: If3ccdda50e4542c62a99021576a7717632e5dd40
George Burgess IV [Mon, 6 Nov 2017 23:45:01 +0000 (23:45 +0000)]
Merge "cmds: add #!s" am:
8911c35df3
am:
2c61e3de27
Change-Id: Ifb1e12b63312570b5451b0e548adf0a5d25c4010
George Burgess IV [Mon, 6 Nov 2017 23:35:24 +0000 (23:35 +0000)]
Merge "cmds: add #!s"
am:
8911c35df3
Change-Id: Iad6d62889031046a063e6abdd0ed74143c58ba94
Yifan Hong [Fri, 3 Nov 2017 01:43:06 +0000 (18:43 -0700)]
BatteryService: Clean up init logic.
* Use getService instead of getTransport, because
getService checks VINTF already. Init has fewer #
of hwbinder calls and simpler logic.
* init() calls registerCallback() to HAL synchronously. Now that
there is a way to check for equality of interfaces in Java,
registerCallback can be called in HealthServiceWrapper.init()
earlier, and registerCallback in service notification can
be avoided when the service pre-exists.
* Instead of making hwbinder calls in a lock in hwbinder threads
(service notification callback), post to a background HandlerThread.
As a consequence, no lock is needed because ordering is ensured.
(Making hwbinder calls in a lock can lead to deadlocks if an
implementation calls back to system server and tries to acquire the
same lock.)
Test: boot 20 times
Test: BatteryServiceTest
Change-Id: Id27b789da78f0df9f867cba75d15203a4fb74e04
Treehugger Robot [Mon, 6 Nov 2017 23:25:27 +0000 (23:25 +0000)]
Merge "cmds: add #!s"
Lucas Dupin [Mon, 6 Nov 2017 23:13:13 +0000 (15:13 -0800)]
Sim Pin layout fixes
Ensure carrier text will be ellipsized properly,
tint SIM icon.
Change-Id: I0b2dfc8f18c6df9c3ebaad241c78e418f1451d44
Fixes:
68050067
Test: Force SIM auth, change font and display sizes.
Fan Zhang [Mon, 6 Nov 2017 23:10:07 +0000 (15:10 -0800)]
Fix robolectric test failure in settings
Bug:
36971201
Test: rerun robolectric tests
Change-Id: Ib5b9ab3f0d5e4f7099accf03d8c52ab7c744144d
TreeHugger Robot [Mon, 6 Nov 2017 21:38:49 +0000 (21:38 +0000)]
Merge "If the absolute value of a sweep angle >= 360 then draw it as an oval."
TreeHugger Robot [Mon, 6 Nov 2017 21:37:41 +0000 (21:37 +0000)]
Merge "Fix the nullptr bug after move operation."
Todd Kennedy [Mon, 6 Nov 2017 21:26:57 +0000 (21:26 +0000)]
Merge "Move code"
Philip P. Moltmann [Mon, 6 Nov 2017 21:12:50 +0000 (21:12 +0000)]
Merge "Allow to attach jvmti agents from inside of process" am:
faffb072a4 am:
491058e089
am:
b567ea9dda
Change-Id: Ie2d729a7c46a558597d626d1ebd5227bf56b1f55
Philip P. Moltmann [Mon, 6 Nov 2017 20:58:48 +0000 (20:58 +0000)]
Merge "Allow to attach jvmti agents from inside of process" am:
faffb072a4
am:
491058e089
Change-Id: Ib636dd1ebcee0bfbd57e12e632137561bb661d3e
Philip P. Moltmann [Mon, 6 Nov 2017 20:46:12 +0000 (20:46 +0000)]
Merge "Allow to attach jvmti agents from inside of process"
am:
faffb072a4
Change-Id: I1f87e45ad3a7c93ab3ba7fd27ac57a1768885faa
Michael Plass [Mon, 6 Nov 2017 20:41:53 +0000 (20:41 +0000)]
Merge "Clarify doc of setWifiEnabled return value"
Treehugger Robot [Mon, 6 Nov 2017 20:34:34 +0000 (20:34 +0000)]
Merge "Allow to attach jvmti agents from inside of process"
Qi Wang [Mon, 6 Nov 2017 20:01:03 +0000 (20:01 +0000)]
Merge "Display the HD icon in the Call Log" am:
3ef58c56b6 am:
50fb8ff6da
am:
051d6b369b
Change-Id: I557c4a58405d33e1b54db7e8f054f030a64aa6a5
Qi Wang [Mon, 6 Nov 2017 19:49:46 +0000 (19:49 +0000)]
Merge "Display the HD icon in the Call Log" am:
3ef58c56b6
am:
50fb8ff6da
Change-Id: Idffacab6edf8bdaf7fb133560f5e9d50cc2c28de
Bo Liu [Mon, 6 Nov 2017 19:48:54 +0000 (19:48 +0000)]
Merge "Export getRenderPipelineType"
Qi Wang [Mon, 6 Nov 2017 19:39:32 +0000 (19:39 +0000)]
Merge "Display the HD icon in the Call Log"
am:
3ef58c56b6
Change-Id: I967c73f1283204fd4f706c425b82fe7af101cb3a
Yangster [Mon, 6 Nov 2017 17:34:01 +0000 (09:34 -0800)]
Fix the nullptr bug after move operation.
Test: passed
Change-Id: I1433b59ffe8fef1b26c424a535c30a4d1e15dff2
Qi Wang [Mon, 6 Nov 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Display the HD icon in the Call Log"
Jorim Jaggi [Mon, 6 Nov 2017 19:26:41 +0000 (19:26 +0000)]
Merge "Fix issues with TRON app transition logging" into oc-mr1-dev am:
9db99f4e23
am:
3d976cd9e7 -s ours
Change-Id: I7909076f349fc7b1adf1f5374217b188ca665c78
Jorim Jaggi [Mon, 6 Nov 2017 19:11:00 +0000 (19:11 +0000)]
Merge "Fix issues with TRON app transition logging" into oc-mr1-dev
am:
9db99f4e23
Change-Id: I60369174d96333cd2703bc765d6d1ddc0f4ab48e
Jorim Jaggi [Mon, 6 Nov 2017 19:01:06 +0000 (19:01 +0000)]
Merge "Fix issues with TRON app transition logging" into oc-mr1-dev
Jorim Jaggi [Mon, 6 Nov 2017 18:59:00 +0000 (18:59 +0000)]
Merge "Fix issues with TRON app transition logging"
Derek Sollenberger [Mon, 6 Nov 2017 18:55:59 +0000 (13:55 -0500)]
If the absolute value of a sweep angle >= 360 then draw it as an oval.
Skia's drawArc API is defined to keep winding when drawing an arc
with a sweep angle > 360. This allows for special path effects
and for points on the arc to potentially be double drawn. This is
not the case for the HWUI implementation that optimistically turns
the call into a drawOval. This CL updates Skia's pipeline to be
in line with the HWUI implemenation.
Test: CtsGraphicsTestCases were added to cover this
Bug:
68764873
Change-Id: I22cd15a53cd2df44421518256d45a2b5d0525a86
TreeHugger Robot [Mon, 6 Nov 2017 18:27:30 +0000 (18:27 +0000)]
Merge "Gauge metric producer."
Jorim Jaggi [Fri, 20 Oct 2017 12:33:18 +0000 (14:33 +0200)]
Fix issues with TRON app transition logging
There was a case where a app launch started activity A. A step in
the UI finished A and started B in the same task. Next time A was
started it immediately finished itself, putting B at the top of
the task. Now, this launch was considered aborted because A was
finished during launching, making it invisible.
We fix this by modifying the logic to only abort the launch if the
full task is not visible anymore after an activity has been set to
invisible.
There is another case where an app launches A, finishes A, and then
launches B. In this case the home gets visible in between so we
don't consider this an app launch anymore, and correctly cancel
the logging. However it's still useful to know that this is
happening to expose it to the developer, so we log any cancel
events, no matter where they are coming from.
Test: Launch Snapchat, click Sign Up, click home, relaunch
Snapchat from home
Test: Open slow app and press home quickly to test cancel.
Change-Id: I211636c97fd6785adb3fe443a8ffa1ae766946a4
Merged-In: I211636c97fd6785adb3fe443a8ffa1ae766946a4
Fixes:
67094673
TreeHugger Robot [Mon, 6 Nov 2017 14:47:14 +0000 (14:47 +0000)]
Merge "Fix content observer in SliceView"
TreeHugger Robot [Mon, 6 Nov 2017 13:44:48 +0000 (13:44 +0000)]
Merge "Optional parameters for TextClassifier APIs."
TreeHugger Robot [Mon, 6 Nov 2017 13:15:42 +0000 (13:15 +0000)]
Merge "Fix TypefaceTest#testMultithreadCacheStressTest"
Neil Fuller [Mon, 6 Nov 2017 09:30:09 +0000 (09:30 +0000)]
Merge "Remove TzDataInstallReceiver"
Hugo Benichi [Mon, 6 Nov 2017 07:41:53 +0000 (07:41 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul" am:
69c9402a29 am:
d025358166
am:
384d458c8f
Change-Id: Ia5c19bfbdf9eea553f4517f312295c14c2f02046
Hugo Benichi [Mon, 6 Nov 2017 07:31:39 +0000 (07:31 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul" am:
69c9402a29
am:
d025358166
Change-Id: If6bf966ba547a2ce50e17340e0374dd9b75b80d9
Hugo Benichi [Mon, 6 Nov 2017 07:21:53 +0000 (07:21 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul"
am:
69c9402a29
Change-Id: I7a5d45feb2315779dad4b0a4f69e761eb90f4ed6
Hugo Benichi [Mon, 6 Nov 2017 07:09:49 +0000 (07:09 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul"
TreeHugger Robot [Mon, 6 Nov 2017 04:28:43 +0000 (04:28 +0000)]
Merge "Support for WM.LayoutParams.PRIVATE_FLAG_IS_SCREEN_DECOR."
Hugo Benichi [Fri, 20 Oct 2017 00:25:29 +0000 (09:25 +0900)]
DefaultNetworkEvent metrics: rehaul
This patch changes instrumentation of default networks and default
network events:
- stop logging events for default network transitions,
but instead consistently log one event per continuous segment
when one given network was the default, including logging an
event for when there is no default network.
- keep a separate rolling buffer of DefaultNetworkEvent for
dumpsys and bug reports.
These changes allow to simplify post aggregation of default network
event metrics by removing any need to do time series processing.
Instead, metrics and counters can be implemented withouth any ambiguity
by following the recipe:
% of x = sum(duration | x = true) / sum (all durations)
where x can be various conditions such as:
- the default network was validated
- the default network was WiFi
- the default network was IPv6
- there was no default network
- ...
Most importantly, this new logging scheme allows to measure much more
reliably:
- the % of the time that a device had Internet, in the sense that the
default network was validated.
- the time transitions between default networks, keyed by previous and
new transports/link layer, which allows to derive wakelock durations
and wakelock power costs from default network switches.
This patch also simplifies the dumpsys interface of the connmetrics
service and reduces the commands to three:
- "flush" for metrics upload.
- "proto" for printing buffered event in text proto format.
- "list" for listing all events and statistics.
Bug:
34901696
Bug:
65700460
Test: runtest frameworks-net
Change-Id: I0521f1681a60cca07ac3bfd5741d64ce44de4cdd
Wale Ogunwale [Wed, 1 Nov 2017 19:51:43 +0000 (12:51 -0700)]
Support for WM.LayoutParams.PRIVATE_FLAG_IS_SCREEN_DECOR.
Allow any process with the STATUS_BAR_SERVICE permission to add a
window that would be considered a screen decoration by the system
similar to the nav bar or status bar.
Test: bit FrameworksServicesTests:com.android.server.wm.ScreenDecorWindowTests
Bug:
68002203
Bug:
64148922
Change-Id: I8c78b82c10c638b54a528a77b96f5bf8dd18bf6f
Jeff Sharkey [Sun, 5 Nov 2017 18:17:38 +0000 (11:17 -0700)]
Don't drop system server StrictMode violations.
The system server doesn't have a ProcessRecord, and all the
downstream already checks if it's null. (Someone incorrectly added
a bailout-when-null check.)
We've actively burned down the number of system violations to a
minimum, and we're chasing the remaining violations with the intent
of them staying at 0, meaning we're okay to remove the batching
logic. (The output format of batched violations is tricky for
dashboards to parse.)
Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.cts.StrictModeTest
Bug:
68662870
Change-Id: Ic1b81200c9550a316939e890a8cea8f37cfbb30b
Erik Kline [Sun, 5 Nov 2017 09:17:43 +0000 (09:17 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()" am:
6d14940a0e am:
93052429e0
am:
37c8698c1f
Change-Id: Ifae53ba606a45b988706f9153e1163294e375607
Erik Kline [Sun, 5 Nov 2017 09:07:22 +0000 (09:07 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()" am:
6d14940a0e
am:
93052429e0
Change-Id: I9ecce595354bafba65df8d63e868be73d91b9503
Erik Kline [Sun, 5 Nov 2017 08:57:48 +0000 (08:57 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"
am:
6d14940a0e
Change-Id: Id3a55dac1b99cfef7f7372eeac18973936f0c6e6
Treehugger Robot [Sun, 5 Nov 2017 08:47:53 +0000 (08:47 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"
George Burgess IV [Sat, 4 Nov 2017 22:58:58 +0000 (15:58 -0700)]
cmds: add #!s
Without this, exec()ing these fails.
Found with `grep -L bin/sh $(grep -Rl Script)`
Bug: None
Test: exec()ed each of these scripts; I no longer get "exec format
error" for any of them.
Change-Id: I47db5007e5cc14ab91eb846b7bffecb925d37874
Erik Kline [Tue, 31 Oct 2017 02:37:41 +0000 (11:37 +0900)]
Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()
Callers of IpClient can tell it via the Builder whether a stable or
a random link-layer identifier is used. IpClient will make the
appropriate IP-layer adjustments (for now this means RFC 7217
addresses or not).
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh runs as well
as possible on AOSP (no new errors)
Bug:
62476366
Change-Id: Ic9d52ea4f2c6c3588852ed41c81f8664d5cc298a
Jeff Sharkey [Sat, 4 Nov 2017 02:39:34 +0000 (02:39 +0000)]
Merge changes I61178def,I536e8934
* changes:
Flip feature flag to enable StrictMode defaults.
Narrower StrictMode defaults.
TreeHugger Robot [Sat, 4 Nov 2017 02:23:10 +0000 (02:23 +0000)]
Merge "Swap the order of synthetic password wrapping"
TreeHugger Robot [Sat, 4 Nov 2017 01:19:38 +0000 (01:19 +0000)]
Merge "Add metric for firmware version dialog fragment"
Winson Chung [Sat, 4 Nov 2017 01:14:24 +0000 (01:14 +0000)]
Merge changes I775aaf78,I60e049a6
* changes:
Ensure that binders are unlinked from death recipients
Fix some voice interaction CTS due to regressions
TreeHugger Robot [Sat, 4 Nov 2017 00:29:43 +0000 (00:29 +0000)]
Merge "Update shortcuts to match spec"
Yifan Hong [Sat, 4 Nov 2017 00:22:38 +0000 (00:22 +0000)]
Merge "BatteryService: add traces."
Yangster [Tue, 31 Oct 2017 19:58:51 +0000 (12:58 -0700)]
Gauge metric producer.
Test: manual tests passed for pushed device temperature.
Change-Id: I7592a4c04666606b745cdb41db8f9d8a96a966da
Jeff Sharkey [Fri, 3 Nov 2017 23:28:45 +0000 (17:28 -0600)]
Flip feature flag to enable StrictMode defaults.
Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.cts.StrictModeTest
Bug:
68662870
Change-Id: I61178def217521ad413074ece3482f4e60428506
Jeff Sharkey [Thu, 2 Nov 2017 01:02:56 +0000 (19:02 -0600)]
Narrower StrictMode defaults.
Until now, userdebug and eng builds have tracked StrictMode
violations on all system apps, including prebuilts that we have no
control over, which results in a lot of unactionable noise.
This CL narrows the set of enabled apps to only "bundled" system
apps, which gives us a much higher chance of burning these violations
down to 0 and keeping them there. We don't have a good proxy for an
app being "bundled", so we detect it based on being in the "android."
or "com.android." package namespace.
Clean up the entire flow of applying StrictMode defaults to make it
much more human-readable. This resulted in us fixing a bug where
StrictMode was never actually enabled for jank-sensitive threads in
system_server!
Relax I/O checks in a few places where we know we're interacting with
procfs or sysfs. Add internal "allow" methods that avoid object
allocation by returning raw mask.
Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.cts.StrictModeTest
Bug:
68662870
Change-Id: I536e8934fbcdec14915fcb10995fc9704ea98b29
Jeff Sharkey [Fri, 3 Nov 2017 23:18:45 +0000 (23:18 +0000)]
Merge "Define NOT_ROAMING network capability." am:
8f380ab29c am:
3fe1ae29cd
am:
69b31d4eb0
Change-Id: I04220ff55fc87dbf8d417a30f15a06a877b412d4
Jeff Sharkey [Fri, 3 Nov 2017 23:07:03 +0000 (23:07 +0000)]
Merge "Define NOT_ROAMING network capability." am:
8f380ab29c
am:
3fe1ae29cd
Change-Id: Ib511f7af82c80fd4e95f4da9de1fdce200deb987
Jeff Sharkey [Fri, 3 Nov 2017 22:52:15 +0000 (22:52 +0000)]
Merge "Define NOT_ROAMING network capability."
am:
8f380ab29c
Change-Id: If36fa11d97d0631df41191ea0cf4ce39981b236f
Selim Gurun [Fri, 3 Nov 2017 22:43:31 +0000 (22:43 +0000)]
Merge "Respect Accessory timeout value when restoring defaults" am:
3ddf22e69c am:
c37036d164
am:
79a2d2a936
Change-Id: I5d315bf170184c65d2713c4be55170bab1eb42f6
Jeff Sharkey [Fri, 3 Nov 2017 22:41:51 +0000 (22:41 +0000)]
Merge "Define NOT_ROAMING network capability."
Rubin Xu [Tue, 31 Oct 2017 15:40:32 +0000 (15:40 +0000)]
Swap the order of synthetic password wrapping
Synthetic password is double encrypted by both a random auth-bound keymaster
key and a secret derived from user password. In order to avoid a password
verification oracle without rate limiting, synthetic password needs to be
encrypted by the derived secret first, and then the auth-bound key. This
change corrects the order of encryptions, as well as adds an upgrade path to
refresh existing credentials.
Test: Running an old build with existing password, flash to new build,
verify the device unlocks successfully.
Bug:
68694819
Change-Id: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f
Selim Gurun [Fri, 3 Nov 2017 22:32:26 +0000 (22:32 +0000)]
Merge "Respect Accessory timeout value when restoring defaults" am:
3ddf22e69c
am:
c37036d164
Change-Id: Id6feac7351a4627c0a4a90b67899ee2c1aa469e8
TreeHugger Robot [Fri, 3 Nov 2017 22:32:00 +0000 (22:32 +0000)]
Merge "Small optimization to oom adj computation."
Selim Gurun [Fri, 3 Nov 2017 22:22:15 +0000 (22:22 +0000)]
Merge "Respect Accessory timeout value when restoring defaults"
am:
3ddf22e69c
Change-Id: I3ee7b72ac335902ce2f9322f0dbedd48429dc663
Jorim Jaggi [Fri, 20 Oct 2017 12:33:18 +0000 (14:33 +0200)]
Fix issues with TRON app transition logging
There was a case where a app launch started activity A. A step in
the UI finished A and started B in the same task. Next time A was
started it immediately finished itself, putting B at the top of
the task. Now, this launch was considered aborted because A was
finished during launching, making it invisible.
We fix this by modifying the logic to only abort the launch if the
full task is not visible anymore after an activity has been set to
invisible.
There is another case where an app launches A, finishes A, and then
launches B. In this case the home gets visible in between so we
don't consider this an app launch anymore, and correctly cancel
the logging. However it's still useful to know that this is
happening to expose it to the developer, so we log any cancel
events, no matter where they are coming from.
Test: Launch Snapchat, click Sign Up, click home, relaunch
Snapchat from home
Test: Open slow app and press home quickly to test cancel.
Change-Id: I211636c97fd6785adb3fe443a8ffa1ae766946a4
Merged-In: I211636c97fd6785adb3fe443a8ffa1ae766946a4
Fixes:
67094673
TreeHugger Robot [Fri, 3 Nov 2017 22:12:50 +0000 (22:12 +0000)]
Merge "Add metric for sim status dialog"
TreeHugger Robot [Fri, 3 Nov 2017 22:10:35 +0000 (22:10 +0000)]
Merge "AAPT2: Fix GetFileType for unicode and long paths on Windows"
John Reck [Fri, 3 Nov 2017 21:57:24 +0000 (21:57 +0000)]
Merge changes Id23aa4ec,Ieb6c8b51
* changes:
Format the world (or just HWUI)
Add .clang-format file
TreeHugger Robot [Fri, 3 Nov 2017 21:49:54 +0000 (21:49 +0000)]
Merge "Switch display control betw. Android and Sidekick"
Chen Xu [Fri, 3 Nov 2017 21:38:20 +0000 (21:38 +0000)]
Merge "new columns of carrierId DB" am:
9c4b4afcbc am:
c5d5be72a3
am:
e9cbcf42ad
Change-Id: I56ac7b277ea7c1f496291dcc8d25c6126beb346e
Treehugger Robot [Fri, 3 Nov 2017 21:32:50 +0000 (21:32 +0000)]
Merge "Respect Accessory timeout value when restoring defaults"