Remi NGUYEN VAN
257dba0544
Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba am: f62d2629ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823015
Change-Id: I9a83de60e0ff61c0cc41daba65568c944f15d7f7
2021-11-22 06:35:27 +00:00
Remi NGUYEN VAN
f62d2629ce
Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823015
Change-Id: I06087e1d4828f4fee7a1b9a42e8bb2596e22684c
2021-11-22 06:19:18 +00:00
Remi NGUYEN VAN
d627d9b1ba
Merge "Remove AsyncChannel usage in NsdManager"
2021-11-22 05:58:15 +00:00
Baligh Uddin
0d7fc7b7c6
Merge "Add visibility for packages/modules/Bluetooth/android/app" am: 7922a468f9 am: cdf6e4ea88
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1898530
Change-Id: Id5ede659262624d17580ec8bcb058544c70f8530
2021-11-21 23:09:13 +00:00
Baligh Uddin
cdf6e4ea88
Merge "Add visibility for packages/modules/Bluetooth/android/app" am: 7922a468f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1898530
Change-Id: I206089a2c159632a87b4db767a638c6cf07f0adf
2021-11-21 22:54:19 +00:00
Baligh Uddin
7922a468f9
Merge "Add visibility for packages/modules/Bluetooth/android/app"
2021-11-21 22:36:50 +00:00
Baligh Uddin
2034ab84b2
Add visibility for packages/modules/Bluetooth/android/app
...
The code residing in packages/modules/Bluetooth/android/app is
migrated from packages/apps/Bluetooth and requires the same
visibility rules for frameworks source code.
This path currently does not exist, but will be required for
migration. Soong build rules do not enforce path existence, which
allows us to add the new path now and not during migration.
Added visibility along with migrated code in a local tree and
performed a local build (bramble-userdebug)
BUG: 196026708
Test: TH
Change-Id: I66cac592489fc1689d45a7b6427bc58c40a824e2
2021-11-21 17:44:16 +00:00
Rambo Wang
14077cf279
Merge "Do not allow null signal thresholds in SignalStrengthUpdateRequest" am: b6aa5b7d37 am: 59cd9748a2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894915
Change-Id: I7fc547bcec6a9d16b2a3e148a4fbfaae50f66285
2021-11-19 23:37:50 +00:00
Rambo Wang
59cd9748a2
Merge "Do not allow null signal thresholds in SignalStrengthUpdateRequest" am: b6aa5b7d37
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894915
Change-Id: I8d106c507913a9f1e0311ac47a5e1da5d34a6ee0
2021-11-19 23:21:26 +00:00
Keith Mok
fd42131e14
Merge "Fix nanosleep in BootAnimation" am: 45e281ef2b am: 73357c61d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891586
Change-Id: Ie6a3997d2b2595e408fc32cee45f419db793b616
2021-11-19 23:12:50 +00:00
Rambo Wang
b6aa5b7d37
Merge "Do not allow null signal thresholds in SignalStrengthUpdateRequest"
2021-11-19 23:02:16 +00:00
Keith Mok
73357c61d0
Merge "Fix nanosleep in BootAnimation" am: 45e281ef2b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891586
Change-Id: I19f359a175aa9596f400481029c029c2dd908aa5
2021-11-19 22:54:54 +00:00
Keith Mok
45e281ef2b
Merge "Fix nanosleep in BootAnimation"
2021-11-19 22:37:57 +00:00
Keith Mok
0f2e66866c
Fix nanosleep in BootAnimation
...
clock_nanosleep will return 0 or error no directly.
Bug: 207149564
Test: Build ok
Change-Id: I15866728719d0672a16b4a76a8fd3be4d53d420a
2021-11-19 20:38:22 +00:00
Yi Kong
55cdedff3f
Merge "profcollect: check hardware capability on a background thread" am: c1e9c53fc3 am: 2d2bd5fcf8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894823
Change-Id: I80db8be5a19d465f96ba55f35226ea8d468dac59
2021-11-19 10:35:29 +00:00
Yi Kong
2d2bd5fcf8
Merge "profcollect: check hardware capability on a background thread" am: c1e9c53fc3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894823
Change-Id: I9ed7068ff02c4314058a7a7ffb97edae3e7b5d43
2021-11-19 10:11:11 +00:00
Yi Kong
c1e9c53fc3
Merge "profcollect: check hardware capability on a background thread"
2021-11-19 09:54:48 +00:00
Yi Kong
da9d0e669b
profcollect: check hardware capability on a background thread
...
This is a blocking event, needs to be moved off from the main thread.
Also, don't schedule background processing service if the hardware
has no tracing support.
Test: manual
Bug: 79161490
Bug: 206986559
Change-Id: I039211b26f25ead66cf125f152e794b0c08057ee
2021-11-19 09:40:12 +00:00
Treehugger Robot
4e5703d57e
Merge "Bluetooth: make it possible to advertise Transport Discovery Data" am: e7adf14ea3 am: 4e43b68f20
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454977
Change-Id: I6865279b3684152e762ad6d86dcdea41c8c2e864
2021-11-19 09:10:42 +00:00
Treehugger Robot
4e43b68f20
Merge "Bluetooth: make it possible to advertise Transport Discovery Data" am: e7adf14ea3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454977
Change-Id: I603dfd54d43ad22c44630b984ea6829611f81b24
2021-11-19 08:53:56 +00:00
Treehugger Robot
e7adf14ea3
Merge "Bluetooth: make it possible to advertise Transport Discovery Data"
2021-11-19 08:42:55 +00:00
Treehugger Robot
467fc19198
Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" am: 9b6a363c8c am: c15f518369
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892999
Change-Id: I814281ec1817d61b5a8d454cf422c57963c8acb0
2021-11-19 03:45:31 +00:00
Treehugger Robot
c15f518369
Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" am: 9b6a363c8c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892999
Change-Id: I178d7c006f1f4be80b02a49d90b4be8237129aa3
2021-11-19 03:33:15 +00:00
Treehugger Robot
9b6a363c8c
Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell"
2021-11-19 03:17:16 +00:00
Sarah Chin
ae68643606
Merge "Revert "Add config to use lower of IPv4/IPv6 MTU values"" am: c4631dca14 am: e876040336
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891498
Change-Id: I639b4abbe3c55be6803ba7c9fc2584d1aaf93c87
2021-11-19 00:47:35 +00:00
Treehugger Robot
6d0d1ff1e6
Merge "Framework and system_server classes can access public vendor libraries" am: 8cb6d28329 am: 1f479b99ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885792
Change-Id: I924242f514458f53cfb71ef83b5084646c8b1b73
2021-11-19 00:47:09 +00:00
Sarah Chin
e876040336
Merge "Revert "Add config to use lower of IPv4/IPv6 MTU values"" am: c4631dca14
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891498
Change-Id: Ib824a3c982a8dbfafb6b9770bad1a6a1859da568
2021-11-19 00:29:27 +00:00
Treehugger Robot
1f479b99ce
Merge "Framework and system_server classes can access public vendor libraries" am: 8cb6d28329
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885792
Change-Id: Ia8fe285e3668fac4c2d6ca8ffff2976df88f90c3
2021-11-19 00:29:06 +00:00
Sarah Chin
c4631dca14
Merge "Revert "Add config to use lower of IPv4/IPv6 MTU values""
2021-11-19 00:23:49 +00:00
Treehugger Robot
8cb6d28329
Merge "Framework and system_server classes can access public vendor libraries"
2021-11-19 00:08:57 +00:00
Treehugger Robot
c74d9d6911
Merge "Create StatsBootstrapAtomService" am: e9f913aee8 am: c2566e6582
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885469
Change-Id: I08d70d539650a2bec4e08681f3c6bd7bd12698cd
2021-11-19 00:04:36 +00:00
Treehugger Robot
c2566e6582
Merge "Create StatsBootstrapAtomService" am: e9f913aee8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885469
Change-Id: I9fe270fa5bffb2edd912ba59fbc6c002497e76b4
2021-11-18 23:48:16 +00:00
Treehugger Robot
e9f913aee8
Merge "Create StatsBootstrapAtomService"
2021-11-18 23:25:21 +00:00
Peiyong Lin
9e526c1d91
Merge "Add owners for GameManager and GameManagerService" am: 6e9b910de2 am: 3afdacc87b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1896952
Change-Id: Ic5c758c011bf2a98db0d6393b288d058f71dfba8
2021-11-18 23:04:05 +00:00
Peiyong Lin
3afdacc87b
Merge "Add owners for GameManager and GameManagerService" am: 6e9b910de2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1896952
Change-Id: I743b627784dd5b39cfd645fe41eb67bd5587acf0
2021-11-18 22:47:30 +00:00
Peiyong Lin
6e9b910de2
Merge "Add owners for GameManager and GameManagerService"
2021-11-18 22:20:52 +00:00
Vince Harron
39465971f4
Merge "BSD grep doesn't support -P" am: 3ad0c61146 am: 6e008cbb2a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500
Change-Id: Ifae93b7302a5b2d743a4c996c91586da6f23e24e
2021-11-18 22:04:40 +00:00
Xin Li
085d433a74
[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 8fb8921a5d -s ours
...
am skip reason: Merged-In I13199bc39e9445929195f3d15579cbffe94e92b0 with SHA-1 0f473ac71a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16280702
Change-Id: I71d3200c9e416353d1eb762a41351727427baad7
2021-11-18 22:01:00 +00:00
Vince Harron
6e008cbb2a
Merge "BSD grep doesn't support -P" am: 3ad0c61146
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500
Change-Id: Ib7267a0b908187432d1b7cd753ca27e707a2a2f1
2021-11-18 21:59:12 +00:00
Vince Harron
3ad0c61146
Merge "BSD grep doesn't support -P"
2021-11-18 21:34:19 +00:00
Xin Li
8fb8921a5d
Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master
2021-11-18 21:28:55 +00:00
Tej Singh
da79f2a110
Create StatsBootstrapAtomService
...
Design doc is at go/statsd-bootstrap-logging. Creates a proxy service for
logging atoms from bootstrap processes to statsd. Service has one API,
which converts StatsBootstrapAtom into StatsEvent and logs to statsd.
This should only used by processes that start in the bootstrap namespace
and cannot directly link statsd's libraries to log to statsd.
Bug: 204889815
Test: booted, made sure binder service was published.
Change-Id: I09709a30a42a7a398234c995324f62a0d62ad24f
2021-11-18 13:27:21 -08:00
TreeHugger Robot
d34bfddf50
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b5d35b0192 -s ours am: 3b102e770e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16294356
Change-Id: I0cc139e7872c195f26a142440a607cd3b1bd70d9
2021-11-18 20:47:47 +00:00
TreeHugger Robot
3b102e770e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b5d35b0192 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16294356
Change-Id: I2094ce428fe288cb28513b371213215adb1e09cc
2021-11-18 20:30:59 +00:00
TreeHugger Robot
5f166acf29
Merge changes from topic "presubmit-am-344b69221da94b53953e04620bfe4930" into sc-qpr1-dev am: 0cfb14e5d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16294356
Change-Id: Ia287e12719efe0011169df97f18f1aa91aa76566
2021-11-18 20:25:18 +00:00
Bill Yi
2e4a51d200
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63e0b1de71 am: d2be1d3896 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16294356
Change-Id: I92199d436dd8e24d51298d2a7b60dbafae7cfabf
2021-11-18 20:25:09 +00:00
TreeHugger Robot
0cfb14e5d6
Merge changes from topic "presubmit-am-344b69221da94b53953e04620bfe4930" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63e0b1de71
Import translations. DO NOT MERGE ANYWHERE
2021-11-18 20:13:51 +00:00
TreeHugger Robot
b5d35b0192
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-11-18 20:13:51 +00:00
TreeHugger Robot
668992eea7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d1a29c38bb -s ours am: 2ba4b1d0ef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16286746
Change-Id: I8710e3f72b87707ac3beaa75352487d7752c8125
2021-11-18 19:45:01 +00:00
TreeHugger Robot
427a309e9a
[automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 457993c4a0" into sc-qpr1-dev am: 40e2c8c362 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16286746
Change-Id: I18b9698489615c9bc595bf4fd1011deb1bb18a5a
2021-11-18 19:44:34 +00:00