OSDN Git Service
Andrew Solovay [Wed, 25 Oct 2017 00:23:33 +0000 (00:23 +0000)]
Merge "docs: Correct labeling for two USB events" into oc-mr1-dev am:
b13dc50d12
am:
cf973cdd89
Change-Id: Icfe783e569feef6269327b931296dc86f91e8ccd
TreeHugger Robot [Wed, 25 Oct 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Adds aidl definitions and their implementations for binder transfer of statsd entries to clients. This change only includes changes on statds side and does not include java library for clients to import. Java library will be a separate change as it requires system api review."
Andrew Solovay [Wed, 25 Oct 2017 00:08:09 +0000 (00:08 +0000)]
Merge "docs: Correct labeling for two USB events" into oc-mr1-dev
am:
b13dc50d12
Change-Id: Ia5b3c5dcb1b2e72f275f12d05fb390699c6831ba
TreeHugger Robot [Wed, 25 Oct 2017 00:03:21 +0000 (00:03 +0000)]
Merge "TextView: Support multiple textAssist menu items."
Andrew Solovay [Tue, 24 Oct 2017 23:59:56 +0000 (23:59 +0000)]
Merge "docs: Correct labeling for two USB events" into oc-mr1-dev
TreeHugger Robot [Tue, 24 Oct 2017 23:52:17 +0000 (23:52 +0000)]
Merge "Use ValueAnimator in DragState"
Donald Chai [Tue, 24 Oct 2017 23:37:27 +0000 (23:37 +0000)]
Merge "AAPT: treat "-I" with lower precedence than main APK for dumping." into oc-mr1-dev am:
d476e2902f
am:
ec4dbd4d40
Change-Id: Iee713c1dfb7246886a7c308c8e955acfaaad53c3
Donald Chai [Tue, 24 Oct 2017 23:27:27 +0000 (23:27 +0000)]
Merge "AAPT: treat "-I" with lower precedence than main APK for dumping." into oc-mr1-dev
am:
d476e2902f
Change-Id: I3ee9ce17439f2a4378c890b954c57a7049fbe036
TreeHugger Robot [Tue, 24 Oct 2017 23:17:34 +0000 (23:17 +0000)]
Merge "AAPT: treat "-I" with lower precedence than main APK for dumping." into oc-mr1-dev
TreeHugger Robot [Tue, 24 Oct 2017 23:07:00 +0000 (23:07 +0000)]
Merge "Docs: clarify WebView support for cleartext traffic"
Malcolm Chen [Tue, 24 Oct 2017 22:51:57 +0000 (22:51 +0000)]
Merge "Copy layout file of preference category from Settings." am:
03c6030ce9 -s ours am:
176b656fb2 -s ours
am:
d303f80780 -s ours
Change-Id: I24636a030808fe4125c5ac0eef3d41233ee3bb17
Malcolm Chen [Tue, 24 Oct 2017 22:42:10 +0000 (22:42 +0000)]
Merge "Copy layout file of preference category from Settings." am:
03c6030ce9 -s ours
am:
176b656fb2 -s ours
Change-Id: Ib2c4d023f26564833619edf2a4ad8eb28c4a29a6
Malcolm Chen [Tue, 24 Oct 2017 22:32:30 +0000 (22:32 +0000)]
Merge "Copy layout file of preference category from Settings."
am:
03c6030ce9 -s ours
Change-Id: Ibacd6e572b31105fe3afe1a904c15ed1d610fc41
yro [Tue, 24 Oct 2017 20:33:21 +0000 (13:33 -0700)]
Adds aidl definitions and their implementations for binder transfer of
statsd entries to clients. This change only includes changes on statds
side and does not include java library for clients to import. Java
library will be a separate change as it requires system api review.
Test: statsd, statsd_test
Change-Id: I306c6e9687801668cc0145b12d38406bfe634775
Treehugger Robot [Tue, 24 Oct 2017 22:22:57 +0000 (22:22 +0000)]
Merge "Copy layout file of preference category from Settings."
Kurt Nelson [Tue, 24 Oct 2017 22:19:44 +0000 (22:19 +0000)]
Merge "Plumb real stack traces through StrictMode"
TreeHugger Robot [Tue, 24 Oct 2017 22:15:58 +0000 (22:15 +0000)]
Merge "vold now deletes misc_ce/misc_de"
Lei Yu [Tue, 24 Oct 2017 22:09:21 +0000 (22:09 +0000)]
Merge "Add paddings when drawing in battery icon"
TreeHugger Robot [Tue, 24 Oct 2017 21:50:59 +0000 (21:50 +0000)]
Merge "Update TextClassifier Javadoc."
Jeff Sharkey [Tue, 24 Oct 2017 21:39:20 +0000 (21:39 +0000)]
Merge "Pass both partition GUID and filesystem UUID."
Fyodor Kupolov [Tue, 24 Oct 2017 21:35:02 +0000 (21:35 +0000)]
Merge "Skip broadcast delivery if user is not running"
Malcolm Chen [Thu, 1 Jun 2017 23:35:43 +0000 (16:35 -0700)]
Copy layout file of preference category from Settings.
Platform packages other than Settings may also use this layout to
be consistent with Settings.
Test: manual
bug:
62200881
Change-Id: I9e45772abac5aacfabbbafb38e287d0b523ef694
Merged-In: I9e45772abac5aacfabbbafb38e287d0b523ef694
TreeHugger Robot [Tue, 24 Oct 2017 21:05:18 +0000 (21:05 +0000)]
Merge "Add EventMetricProducer"
TreeHugger Robot [Tue, 24 Oct 2017 21:04:02 +0000 (21:04 +0000)]
Merge "Simplified ActivityStack.shouldBeVisible()"
TreeHugger Robot [Tue, 24 Oct 2017 20:42:36 +0000 (20:42 +0000)]
Merge "Expose SmsMessage#FORMAT_ constants as public APIs."
Abodunrinwa Toki [Tue, 17 Oct 2017 19:33:00 +0000 (20:33 +0100)]
TextView: Support multiple textAssist menu items.
Bug:
68049162
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I831e6933b584a2999f159dc2d80113ea9ba717f8
TreeHugger Robot [Tue, 24 Oct 2017 20:05:52 +0000 (20:05 +0000)]
Merge "Add OWNERS for settingslib"
Abodunrinwa Toki [Mon, 23 Oct 2017 23:49:27 +0000 (00:49 +0100)]
Update TextClassifier Javadoc.
Bug:
65112496
Test: none
Change-Id: Id3732a2c8ed372be0f717346e6aa92b9e614ad04
Paul Crowley [Tue, 17 Oct 2017 17:54:12 +0000 (10:54 -0700)]
vold now deletes misc_ce/misc_de
Bug:
25861755
Test: create user, populate vold subdirectory, delete user, check logs
Change-Id: I95f2d8d52ea9cdb621b6bf0b18d6151721dcf8d9
Chad Brubaker [Tue, 24 Oct 2017 19:28:37 +0000 (19:28 +0000)]
Merge "Change cleartext traffic permitted default for P apps"
Yao Chen [Mon, 23 Oct 2017 19:50:02 +0000 (12:50 -0700)]
Add EventMetricProducer
+ Started to use ProtoOutputStream in EventMetricProducer.
[TODO]: We need to auto-generate fieldIds for StatsLogReport, XXXMetricData, etc.
[TODO]: We need to add Enum type to liblog, otherwise we cannot reconstruct a proto containing
an enum
+ Some refactor in metric initialization code. There are still boiler plate code, because Metrics
are similar but with subtle differences.
Test: statsd_test
Change-Id: Id7e3212566249a8139b9680f04238c455d50c1b8
TreeHugger Robot [Tue, 24 Oct 2017 18:41:27 +0000 (18:41 +0000)]
Merge "Move mGlobalGids and mSystemPermissions"
TreeHugger Robot [Tue, 24 Oct 2017 18:33:35 +0000 (18:33 +0000)]
Merge "GnssLocationProvider: modify "=" restriction to support URL with "=" inside"
Jeff Davidson [Fri, 13 Oct 2017 18:23:28 +0000 (11:23 -0700)]
Expose SmsMessage#FORMAT_ constants as public APIs.
These constants are intended to be arguments for
SmsManager#injectSmsPdu which is already public, and they are
referenced from CTS as well. Therefore, they should also be public.
Also add a @StringDef for these values and clean up the Javadoc while
we're here to use properly-linked references to other APIs.
Change-Id: I4e513f49f18350b93cccdc0d8a5847d31eefe7e2
Fixes:
67751433
Test: TreeHugger (no functional changes)
TreeHugger Robot [Tue, 24 Oct 2017 18:22:13 +0000 (18:22 +0000)]
Merge "Move mPermissionGroups"
Andrew Solovay [Tue, 24 Oct 2017 18:20:38 +0000 (11:20 -0700)]
docs: Correct labeling for two USB events
Per bug, these were mislabeled as broadcast actions, when they're
actually activity intents. This has consequences post-O, since
broadcast actions are now subject to limitations.
Doc is staged to:
http://go/dac-stage/reference/android/hardware/usb/UsbManager.html
Bug:
36672976
Test: make ds-docs
Change-Id: I2b515b1ac152de389f952af21166ed2ba7843044
Jeff Sharkey [Tue, 24 Oct 2017 17:08:50 +0000 (11:08 -0600)]
Pass both partition GUID and filesystem UUID.
FDE keys are indexed using the partition GUID, while FBE keys will be
indexed using the filesystem UUID, so pass both of those identifiers
along when forgetting a volume.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug:
25861755
Change-Id: I88e13b6b39c5675403a3199e69f978720f26814a
Lucas Dupin [Mon, 23 Oct 2017 21:31:45 +0000 (14:31 -0700)]
Fix SliceProvider threading
Binding a slice that lives in the same process would lead to a
deadlock since we'd sleep the main thread while waiting for it
to decrease the CountdownLatch. Now we're checking if we're
already in the main looper and only posting when necessary.
Test: run code in ag/
3082570
Change-Id: Id7c4f9dd8d84bf0e513606cbe07bf87750c567e4
Wale Ogunwale [Wed, 18 Oct 2017 22:19:59 +0000 (15:19 -0700)]
Simplified ActivityStack.shouldBeVisible()
The method can now be simplified since we have a stack per task so
if a stack should be visible is now a question of if it is occluded
by another stack.
Also,
- Fixed an issue where the windowing mode of the primary split-screen
stack was changing to split-screen-secondary instead of fullscreen
when we are exiting split-screen mode because we are not allowed to
to create fullscreen stack when there is a primary split-screen stack. We
now clear the reference to the primary split-screen stack when exiting
split-screen mode.
- Re-worked windowing mode resolution to be inside ActivityDisplay
object since the determination of the windowing mode is dependant on the
display.
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests
Test: Existing tests pass.
Test: go/wm-smoke
Bug:
64146578
Fixes:
67914671
Change-Id: I7e8cfe49fbf6a5836ded022bb11adcde58ae689c
Fyodor Kupolov [Mon, 23 Oct 2017 18:23:51 +0000 (11:23 -0700)]
Skip broadcast delivery if user is not running
Test: create/switch-to guest repeatedly - no app errors
Bug:
62105195
Change-Id: I2dc9967912771bf7c0adc95c26888f83432388c8
Yi Jin [Tue, 24 Oct 2017 17:26:51 +0000 (17:26 +0000)]
Merge "Fix several nits"
jackqdyulei [Wed, 18 Oct 2017 21:00:56 +0000 (14:00 -0700)]
Add OWNERS for settingslib
Bug:
67953936
Test: Manual
Change-Id: Ic1689755060ae3514b7c44f3c3518d511c12d7a4
Android Build Merger (Role) [Tue, 24 Oct 2017 17:11:15 +0000 (17:11 +0000)]
Merge "Merge "Return a port from bindToPort() in IpSecService" am:
9305fb7ea1 am:
d6ab173f6c am:
a18f840082"
Benedict Wong [Tue, 24 Oct 2017 17:09:28 +0000 (17:09 +0000)]
Merge "Return a port from bindToPort() in IpSecService" am:
9305fb7ea1 am:
d6ab173f6c
am:
a18f840082
Change-Id: I0d1c17c3740983ab0cbc24c2cd0d3a530b56ca99
Lei Yu [Tue, 24 Oct 2017 17:07:24 +0000 (17:07 +0000)]
Merge "Add OWNERS for folder inputmethod"
Benedict Wong [Tue, 24 Oct 2017 16:54:57 +0000 (16:54 +0000)]
Merge "Return a port from bindToPort() in IpSecService" am:
9305fb7ea1
am:
d6ab173f6c
Change-Id: Ie59d496a38bf9775c1f40a543a24cb3fec5719bf
Tenghui Zhu [Tue, 24 Oct 2017 16:50:06 +0000 (16:50 +0000)]
Merge "AAPT leave <gradient> alone for VDC" into oc-mr1-dev am:
81831f89ce
am:
fa1d67a6f8
Change-Id: I967e540cd9f40db3f957f188bcf557bc6a95cb9b
Benedict Wong [Tue, 24 Oct 2017 16:44:59 +0000 (16:44 +0000)]
Merge "Return a port from bindToPort() in IpSecService"
am:
9305fb7ea1
Change-Id: I51705d5db6af560f2423ef7861bfde6734632ec9
Tenghui Zhu [Tue, 24 Oct 2017 16:36:28 +0000 (16:36 +0000)]
Merge "AAPT leave <gradient> alone for VDC" into oc-mr1-dev
am:
81831f89ce
Change-Id: I0ee4801c31a63b8e617adb053a773456814b65ff
Benedict Wong [Tue, 24 Oct 2017 16:31:21 +0000 (16:31 +0000)]
Merge "Return a port from bindToPort() in IpSecService"
Tenghui Zhu [Tue, 24 Oct 2017 16:22:49 +0000 (16:22 +0000)]
Merge "AAPT leave <gradient> alone for VDC" into oc-mr1-dev
Rebecca Silberstein [Tue, 24 Oct 2017 16:10:41 +0000 (16:10 +0000)]
Merge changes from topic "delete_setWifiApEnabled"
* changes:
WifiManager: delete the setWifiApEnabled method
WifiManager: remove last remnants of setWifiApEnabled
TreeHugger Robot [Tue, 24 Oct 2017 15:37:56 +0000 (15:37 +0000)]
Merge "Refactor some WebView loading logic into WebViewLibraryLoader."
Bryce Lee [Tue, 24 Oct 2017 14:50:27 +0000 (14:50 +0000)]
Merge "Make Session package private."
Bryce Lee [Mon, 23 Oct 2017 19:57:37 +0000 (12:57 -0700)]
Make Session package private.
This change requires moving initialization of the mock session until
after the dex flags and mock infrastructure has been set up.
Test: bit FrameworksServicesTests:com.android.server.wm.WindowLayersControllerTests
Change-Id: Icb469d09d8f591da6bb6a81a3741e508a3a03bd5
TreeHugger Robot [Tue, 24 Oct 2017 14:37:53 +0000 (14:37 +0000)]
Merge "[Magnifier - 6] Simplify API and configuration"
Gustav Sennton [Tue, 24 Oct 2017 13:28:26 +0000 (14:28 +0100)]
Refactor some WebView loading logic into WebViewLibraryLoader.
This is in preparation for a patch which with bigger changes for
WebViewLibraryLoader (including tests).
Bug:
28736099
Test: ensure relro loaded into app process on 32-bit device.
Change-Id: Ic1aef697c1010380d8bce466ee14627d9cdff9e7
Todd Kennedy [Tue, 10 Oct 2017 16:55:53 +0000 (09:55 -0700)]
Move mGlobalGids and mSystemPermissions
This is the last tiny move before moving methods to grant/update
permissions.
Bug:
63539144
Test: Manual. Builds and runs
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PermissionsHostTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermissionTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Test: bit FrameworksServicesTests:com.android.server.pm.PackageManagerSettingsTests
Change-Id: Ic2138cf1e442d9d10e8a3ad6dfa24c403aaeca67
Todd Kennedy [Fri, 6 Oct 2017 20:46:22 +0000 (13:46 -0700)]
Move mPermissionGroups
Bug:
63539144
Test: Manual. Builds and runs
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PermissionsHostTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermissionTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Test: bit FrameworksServicesTests:com.android.server.pm.PackageManagerSettingsTests
Change-Id: I3b019babc81997d1d70c14675a34b6a8bec5387d
Donald Chai [Tue, 24 Oct 2017 11:40:55 +0000 (11:40 +0000)]
Merge "AAPT2: Sanitize resource qualifiers before using in split names." into oc-mr1-dev am:
72b3d46794
am:
b08aa082a4
Change-Id: If635231da8db6658ba1e016c4c84292e73972066
Donald Chai [Tue, 24 Oct 2017 11:31:04 +0000 (11:31 +0000)]
Merge "AAPT2: Sanitize resource qualifiers before using in split names." into oc-mr1-dev
am:
72b3d46794
Change-Id: I1f87fce18c665433ad916ac47cd3f78ae007c776
TreeHugger Robot [Tue, 24 Oct 2017 11:16:03 +0000 (11:16 +0000)]
Merge "AAPT2: Sanitize resource qualifiers before using in split names." into oc-mr1-dev
Benoit Lamarche [Tue, 24 Oct 2017 10:31:11 +0000 (10:31 +0000)]
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection" am:
5aa4dafa58 am:
4927808d39
am:
bbb2eb3f59
Change-Id: Ic33dffeeac6445773de09ec9c1cb4bc3b79ae5ea
Paul Duffin [Tue, 24 Oct 2017 10:20:16 +0000 (10:20 +0000)]
Merge "Preserve order of shared library files" am:
596bb64796 am:
e74db7c7e2 -s ours
am:
46080df911 -s ours
Change-Id: I7ebb756b46dd5d35c20af6179b43ad126cb7bf0b
Andrei Stingaceanu [Tue, 24 Oct 2017 10:17:35 +0000 (11:17 +0100)]
[Magnifier - 6] Simplify API and configuration
* removed "scale" from the show(...) API
* made the zoom scale a dimension => the widget is
fully self-configured
* fixed the magnifier not always scaling the content
to the full pop-up window size
Bug:
63531115
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: manual test that shows the magnifier working
Change-Id: Ibf5c571970c8f6bd3cdbc6d46fbe57d08291783c
Benoit Lamarche [Tue, 24 Oct 2017 10:13:58 +0000 (10:13 +0000)]
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection" am:
5aa4dafa58
am:
4927808d39
Change-Id: I718efd7536331508531bb7c30dfab3638ef60d0e
Paul Duffin [Tue, 24 Oct 2017 10:07:37 +0000 (10:07 +0000)]
Merge "Preserve order of shared library files" am:
596bb64796
am:
e74db7c7e2 -s ours
Change-Id: I52c45674dc6ddf972694d4e4dc71856453e68a96
Benoit Lamarche [Tue, 24 Oct 2017 08:54:09 +0000 (08:54 +0000)]
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection"
am:
5aa4dafa58
Change-Id: Ic8f892399cdfa746a2fab4a841469f41f0fe98f5
Benoit Lamarche [Tue, 24 Oct 2017 08:42:10 +0000 (08:42 +0000)]
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection"
Paul Duffin [Tue, 24 Oct 2017 07:59:35 +0000 (07:59 +0000)]
Merge "Preserve order of shared library files"
am:
596bb64796
Change-Id: I95c1cd65ded3b3d14b7f916c8a10825399e7b8ec
Paul Duffin [Tue, 24 Oct 2017 07:48:13 +0000 (07:48 +0000)]
Merge "Preserve order of shared library files"
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:47:51 +0000 (06:47 +0000)]
Merge changes from topic "bt_get_cod" am:
35dc02004c am:
178e5873b0
am:
f7e25297ae
Change-Id: Ic6d8ff403f54e54d9b353f67f76851bd46b0aff6
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:36:52 +0000 (06:36 +0000)]
Merge changes from topic "bt_get_cod" am:
35dc02004c
am:
178e5873b0
Change-Id: I3fef3c3a196af47518affea2ecac04ccadf4de4e
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:32:30 +0000 (06:32 +0000)]
Merge "Persist Bluetooth CoD config value across reboot" am:
ba45409c92 am:
b977674b17
am:
7cc5e10c2f
Change-Id: I4a0d1e8cc4f879896c3029a8f871d794362e0bca
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:27:23 +0000 (06:27 +0000)]
Merge changes from topic "bt_get_cod"
am:
35dc02004c
Change-Id: Iec67ef3cc9c990b4d5285b23b51972915cbbd335
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:22:08 +0000 (06:22 +0000)]
Merge "Persist Bluetooth CoD config value across reboot" am:
ba45409c92
am:
b977674b17
Change-Id: I6b6745eb558d664e1f17d5e808c66990cd0038eb
Treehugger Robot [Tue, 24 Oct 2017 06:14:37 +0000 (06:14 +0000)]
Merge changes from topic "bt_get_cod"
* changes:
Add missing intents to protected broadcasts
Get Bluetooth Class of Device
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:13:48 +0000 (06:13 +0000)]
Merge "Persist Bluetooth CoD config value across reboot"
am:
ba45409c92
Change-Id: I4d28d0b1b52e587285d3b92b66fdc4b6c1b38720
Pulkit Bhuwalka [Tue, 26 Sep 2017 02:19:46 +0000 (19:19 -0700)]
Add missing intents to protected broadcasts
Intents broadcasted by the Bluetooth stack need to be added to protected
broadcasts else they complain with errors in the log since Bluetooth is
considered a system process. A few of these intents, especially AVRCP
intents were missing in the list.
Bug: None
Test: Verified errors don't show up after introducing the intents while
playing on a sink device.
Change-Id: Ie283c50243d9a1bac3fd937f58bc1ddc20867d2f
Pulkit Bhuwalka [Wed, 20 Sep 2017 22:10:45 +0000 (15:10 -0700)]
Get Bluetooth Class of Device
Adds API to fetch Bluetooth CoD value of the stack. The API is hidden to
only be used by System code.
Bug:
36015415
Test: Verified fetching of COD from test app on flashed device, after modification
and after after reboot.
Change-Id: Ie35ecf141704c2aac46678da7cabdc7203a088f2
Treehugger Robot [Tue, 24 Oct 2017 06:05:45 +0000 (06:05 +0000)]
Merge "Persist Bluetooth CoD config value across reboot"
TreeHugger Robot [Tue, 24 Oct 2017 01:50:51 +0000 (01:50 +0000)]
Merge "Prevent restoring task when updating task"
Nate Fischer [Tue, 24 Oct 2017 01:02:41 +0000 (18:02 -0700)]
Docs: clarify WebView support for cleartext traffic
No change to logic, docs change only.
WebView added support for android:usesCleartextTraffic for apps
targeting O and above (API level 26). This CL clarifies WebView's
support in the Android documentation.
This also fixes a preexisting presubmit error in
NetworkSecurityPolicy.java (unused import).
Bug:
67714197
Test: N/A
Change-Id: If6bfd36bc65926a1b032813598c85146ccfde969
Hugo Benichi [Tue, 24 Oct 2017 00:35:31 +0000 (00:35 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats" am:
64ef2a4d28 am:
a3e7c1a3db
am:
47fb2aa929
Change-Id: I2a46f705a2a28c1e09d50a853f11edef13ad6821
TreeHugger Robot [Tue, 24 Oct 2017 00:28:00 +0000 (00:28 +0000)]
Merge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib"
Hugo Benichi [Tue, 24 Oct 2017 00:25:11 +0000 (00:25 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats" am:
64ef2a4d28
am:
a3e7c1a3db
Change-Id: Iaad5f5b142209ce36f70249a438b3dd66fb92f07
Hugo Benichi [Tue, 24 Oct 2017 00:14:48 +0000 (00:14 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats"
am:
64ef2a4d28
Change-Id: I7f25f4ed42f0aecea7a1bb09b8c65a5d2e4a84cd
Hugo Benichi [Mon, 23 Oct 2017 23:54:53 +0000 (23:54 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats"
Jeff Sharkey [Mon, 23 Oct 2017 23:50:52 +0000 (23:50 +0000)]
Merge "Export AIDL for keystore Android.bp."
Yi Jin [Mon, 23 Oct 2017 22:42:44 +0000 (15:42 -0700)]
Fix several nits
1. Change the APIs of ProtoOutputStream to be able to write bytes
2. Fix the tests in incidentd, stdout is closed so can't capture the
value, use temporaryFile instead.
Test: N/A
Change-Id: Ibc31f2efd068afc6c06188d92f57ca5a754c3683
Winson Chung [Mon, 23 Oct 2017 18:10:58 +0000 (11:10 -0700)]
Prevent restoring task when updating task
Cherry-pick from: Ie501add4b72a63be0b8514136f10a09fbdd0c6c3
Symptom: App activity shown between launcher & wallpaper.
RootCause:
Some AM public Apis (getTaskInfo(), setExcluteFromRecent()) will calling
AM.anyTaskForIdLocked with MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE
parameter to get task record & add task into stack bottom,
that will affect wm side also create task & bring task stack to bottom
due to task.createWindowContainer() in restoreRecentTaskLocked().
Solution:
using MATCH_TASK_IN_STACKS_OR_RECENT_TASKS to get task record without
restore record into stack.
Bug:
67634904
Test: As below issue described sample app flows. b/
68038609
Change-Id: I8241c0956a3323a70e754c794dd562540ff4eaf4
Signed-off-by: Winson Chung <winsonc@google.com>
Hansong Zhang [Mon, 23 Oct 2017 22:59:33 +0000 (22:59 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)" am:
8218b219f3 am:
c8a370aeba
am:
5140894a5d -s ours
Change-Id: I2a9e23646d21bc97b02e9648704e5f766432d3cd
Hansong Zhang [Mon, 23 Oct 2017 22:46:31 +0000 (22:46 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)" am:
8218b219f3
am:
c8a370aeba
Change-Id: I2c5da84f5b57496e2a0ef45fb17085670f7465a9
TreeHugger Robot [Mon, 23 Oct 2017 22:36:01 +0000 (22:36 +0000)]
Merge "Anomaly detection for count reads from config"
Hansong Zhang [Mon, 23 Oct 2017 22:33:50 +0000 (22:33 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)"
am:
8218b219f3
Change-Id: Ic085deaa070b4008b34d03b507f81a5df220764a
Treehugger Robot [Mon, 23 Oct 2017 22:22:41 +0000 (22:22 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)"
TreeHugger Robot [Mon, 23 Oct 2017 22:21:43 +0000 (22:21 +0000)]
Merge "Stop octopus animation when paused"
Hansong Zhang [Fri, 20 Oct 2017 22:55:59 +0000 (15:55 -0700)]
Change Bluetooth HID Profile Name (1/6)
Make the Bluetooth HID profile name consistent with the Bluetooth HID service
name.
BluetoothInputHost → BluetoothHidDevice
BluetoothInputDevice → BluetoothHidHost
IBluetoothInputHost → IBluetoothHidDevice
IBluetoothInputDevice → IBluetoothHidHost
BluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE
BluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST
(Cherry-picked from commit
c26c76c63d933f8057f795d05624f91b811c8c71)
Merged-In: Iadb890a54dd3d6868b87514472bbac6bb0c6179f
Bug:
68055651
Test: make
Change-Id: Iadb890a54dd3d6868b87514472bbac6bb0c6179f
TreeHugger Robot [Mon, 23 Oct 2017 22:10:02 +0000 (22:10 +0000)]
Merge "Skip blocking InputConnection APIs after unbind"
Jeff Sharkey [Mon, 23 Oct 2017 22:04:31 +0000 (16:04 -0600)]
Export AIDL for keystore Android.bp.
Test: builds, boots
Bug:
67041047
Change-Id: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1