Junyu Lai
0fd819f75f
Merge "[MS66] Initialize TrafficStats with context" am: a411d32226 am: 71aca9af8f am: db3f98710b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956077
Change-Id: Ide5f7ac8fb4ebafbe797e9d8d13662844d1b4bfd
2022-01-22 00:48:35 +00:00
Sharon Su
2fff06e2cf
Merge "Create directories for wallpaper effects generation api and and owners files. Bug: 213238425 Test: meta file change" am: 3166def10f am: 58e37e59d1 am: 9075544cd1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955206
Change-Id: Ie939bcf302fc7f6939e2ac84352490ba9a324fc4
2022-01-22 00:48:06 +00:00
Junyu Lai
db3f98710b
Merge "[MS66] Initialize TrafficStats with context" am: a411d32226 am: 71aca9af8f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956077
Change-Id: I6dbe1599e1eddb7cf5fc1cc396862c66c0ea0c94
2022-01-22 00:31:34 +00:00
Sharon Su
9075544cd1
Merge "Create directories for wallpaper effects generation api and and owners files. Bug: 213238425 Test: meta file change" am: 3166def10f am: 58e37e59d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955206
Change-Id: Ib20ed16717dca5a44c31aa1cdd7221bf17e5f9a8
2022-01-22 00:31:15 +00:00
Junyu Lai
71aca9af8f
Merge "[MS66] Initialize TrafficStats with context" am: a411d32226
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956077
Change-Id: Ibfb7180cdc0e9dc8186fbeccbcf946c36afa7c01
2022-01-22 00:19:33 +00:00
Sharon Su
58e37e59d1
Merge "Create directories for wallpaper effects generation api and and owners files. Bug: 213238425 Test: meta file change" am: 3166def10f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955206
Change-Id: I41c7a94a2dda19f86f2e7b714b8fa4f88b635570
2022-01-22 00:18:55 +00:00
Junyu Lai
a411d32226
Merge "[MS66] Initialize TrafficStats with context"
2022-01-22 00:06:17 +00:00
Sharon Su
3166def10f
Merge "Create directories for wallpaper effects generation api and and owners files. Bug: 213238425 Test: meta file change"
2022-01-22 00:05:24 +00:00
Dmitri Plotnikov
256a465181
Merge "Fix concurrency issue with BatteryUsageStats" am: 587eef25c9 am: e855d9f17e am: fb37eaa5df
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927563
Change-Id: Ie0e2b0be5d90cf1a40957a343a44489714446d0f
2022-01-22 00:01:17 +00:00
Dmitri Plotnikov
fb37eaa5df
Merge "Fix concurrency issue with BatteryUsageStats" am: 587eef25c9 am: e855d9f17e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927563
Change-Id: I5d98a075c1faca7e8cf3c1dfb673da9854114bbf
2022-01-21 23:31:34 +00:00
Dmitri Plotnikov
e855d9f17e
Merge "Fix concurrency issue with BatteryUsageStats" am: 587eef25c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927563
Change-Id: Iebd2db7d42cc4dbbfd344c855695a837f246e477
2022-01-21 23:14:27 +00:00
Dmitri Plotnikov
587eef25c9
Merge "Fix concurrency issue with BatteryUsageStats"
2022-01-21 22:44:28 +00:00
Treehugger Robot
f4e42f6e34
Merge "Clarify number format expectations for get/setPhoneNumber" am: af4fc5fb39 am: c1fe8d36d0 am: c1dea0eb6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949477
Change-Id: I6a8304b673ef34dcea2b34717a096032d47b6a07
2022-01-21 21:56:58 +00:00
Treehugger Robot
0a30bb6382
Merge "Update current.txt file for getConnectedGroupLeadDevice" am: 3275b328fd am: a1dd80e00f am: 0271082216
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934975
Change-Id: I9afe42af1df5f5201ed47a22c1d72836246697cd
2022-01-21 21:56:31 +00:00
Treehugger Robot
c1dea0eb6f
Merge "Clarify number format expectations for get/setPhoneNumber" am: af4fc5fb39 am: c1fe8d36d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949477
Change-Id: Ie9f16a17e8e3b8e30fca15c31456bf7549f7ea01
2022-01-21 21:44:29 +00:00
Treehugger Robot
0271082216
Merge "Update current.txt file for getConnectedGroupLeadDevice" am: 3275b328fd am: a1dd80e00f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934975
Change-Id: Ia3725f5bcce08c24eac74d6deaad2f359f4fa980
2022-01-21 21:43:58 +00:00
Treehugger Robot
c1fe8d36d0
Merge "Clarify number format expectations for get/setPhoneNumber" am: af4fc5fb39
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949477
Change-Id: Ie8ae7dc0d60ca635a5d189e3f47f9a24fa309e17
2022-01-21 21:24:49 +00:00
Treehugger Robot
a1dd80e00f
Merge "Update current.txt file for getConnectedGroupLeadDevice" am: 3275b328fd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934975
Change-Id: Id5cf2c56f26a97219e4fa15cb2b3bf8da88c012e
2022-01-21 21:19:59 +00:00
Treehugger Robot
af4fc5fb39
Merge "Clarify number format expectations for get/setPhoneNumber"
2022-01-21 21:06:51 +00:00
Treehugger Robot
3275b328fd
Merge "Update current.txt file for getConnectedGroupLeadDevice"
2022-01-21 21:02:54 +00:00
Treehugger Robot
34ed1076c0
Merge "Update current.txt for Broadcast feature supported API" am: 72f1c5693d am: 3fb2bbc273 am: a3ea867d3f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954020
Change-Id: Ib396388c3587fbcf8d69fcd73616e83ad4b80528
2022-01-21 20:41:23 +00:00
Treehugger Robot
2ec69786ca
Merge "Update the system-current file for getAudioLocation API" am: 01e0977975 am: c85b7e1513 am: 482ad83d4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936444
Change-Id: I7bd0282cf02cf70bef23d71aa3cb7d5eba654843
2022-01-21 20:40:03 +00:00
Treehugger Robot
a3ea867d3f
Merge "Update current.txt for Broadcast feature supported API" am: 72f1c5693d am: 3fb2bbc273
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954020
Change-Id: If978ab355acd3cdcfaec54c4fd2f522d7227d3b4
2022-01-21 20:11:29 +00:00
Treehugger Robot
482ad83d4f
Merge "Update the system-current file for getAudioLocation API" am: 01e0977975 am: c85b7e1513
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936444
Change-Id: Icf6c65d273f3bd58ee8399eff7050b7af7267afa
2022-01-21 20:10:35 +00:00
Treehugger Robot
3fb2bbc273
Merge "Update current.txt for Broadcast feature supported API" am: 72f1c5693d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954020
Change-Id: Ib550f8d695e6235ad9d80a176420b4906cc76334
2022-01-21 20:02:28 +00:00
Treehugger Robot
c85b7e1513
Merge "Update the system-current file for getAudioLocation API" am: 01e0977975
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936444
Change-Id: I47676183d332e5384f4e42389f734f8bd7de9e6c
2022-01-21 19:59:59 +00:00
Treehugger Robot
72f1c5693d
Merge "Update current.txt for Broadcast feature supported API"
2022-01-21 19:56:21 +00:00
Treehugger Robot
01e0977975
Merge "Update the system-current file for getAudioLocation API"
2022-01-21 19:51:57 +00:00
Yushin Cho
c08386e934
Merge "enc stat: Add feauture and its keys to MediaCodec" am: 93f84575c3 am: fc1026972d am: e7d1145f95
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891583
Change-Id: I8b6d2be7809e82a3e655d91404c1c86548761b3c
2022-01-21 19:15:52 +00:00
Jack He
b468739746
Merge "hap: Add constants for the Hearing Access Profile" am: d370e1ec4d am: 11c025f75d am: 79d647b764
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884593
Change-Id: I7134f282ce7257f1c11ed20418c1ffa3e00f4def
2022-01-21 19:15:36 +00:00
Chen Chen
cd824ce8d7
Merge "SpatialAudio: Provide API to allow/disallow low latency audio" am: c96c1e8469 am: 6d7655c497 am: 7f96baa087
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955016
Change-Id: I0d6ed4d567559743d7d31b64891caa7613fee231
2022-01-21 19:15:09 +00:00
Yushin Cho
e7d1145f95
Merge "enc stat: Add feauture and its keys to MediaCodec" am: 93f84575c3 am: fc1026972d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891583
Change-Id: Ib2557d6089a5e15b5d7d1be6120fe020a73d0597
2022-01-21 18:53:57 +00:00
Jack He
79d647b764
Merge "hap: Add constants for the Hearing Access Profile" am: d370e1ec4d am: 11c025f75d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884593
Change-Id: I1e010dbdc07f628fdc8d993ba9d6fb736329237c
2022-01-21 18:53:37 +00:00
Chen Chen
7f96baa087
Merge "SpatialAudio: Provide API to allow/disallow low latency audio" am: c96c1e8469 am: 6d7655c497
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955016
Change-Id: I9fd4cd23dd84e18707100feb263d77044c23c617
2022-01-21 18:52:40 +00:00
Yushin Cho
fc1026972d
Merge "enc stat: Add feauture and its keys to MediaCodec" am: 93f84575c3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891583
Change-Id: Ib559cfdba74876b06ba7582991228a7ebe6cc802
2022-01-21 18:40:32 +00:00
Yushin Cho
93f84575c3
Merge "enc stat: Add feauture and its keys to MediaCodec"
2022-01-21 18:36:05 +00:00
Jack He
11c025f75d
Merge "hap: Add constants for the Hearing Access Profile" am: d370e1ec4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884593
Change-Id: I1e75d284d0dd981f7ef188d8f59eef1834568891
2022-01-21 18:35:33 +00:00
Chen Chen
6d7655c497
Merge "SpatialAudio: Provide API to allow/disallow low latency audio" am: c96c1e8469
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955016
Change-Id: I6176da6b37dcc0cdf7f47bfbd0a1074b4f532af4
2022-01-21 18:34:48 +00:00
Jack He
d370e1ec4d
Merge "hap: Add constants for the Hearing Access Profile"
2022-01-21 18:20:19 +00:00
Chen Chen
c96c1e8469
Merge "SpatialAudio: Provide API to allow/disallow low latency audio"
2022-01-21 18:17:06 +00:00
Hao Ke
70398d2001
Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4a9 am: 6c1f3fbcd2 am: 1ff8962b79
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1953436
Change-Id: Idc81838d965832f5d97af67e0006565fe93a3a76
2022-01-21 17:51:42 +00:00
Hao Ke
1ff8962b79
Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4a9 am: 6c1f3fbcd2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1953436
Change-Id: I24500f0428749baf7e1da43464982c1bd15c28f2
2022-01-21 17:33:28 +00:00
Hao Ke
6c1f3fbcd2
Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1953436
Change-Id: Iaa3eaadd033a9b839cc8f74e0de3f10cd37e428e
2022-01-21 17:16:36 +00:00
Junyu Lai
de9cf3392d
[MS66] Initialize TrafficStats with context
...
TrafficStats has static methods created in API level 8 that need
access to NetworkStatsManager but doesn't take a context.
Previously this was achieved by using ServiceManager, but
with TrafficStats moving to the connectivity module, this
is no longer possible.
Instead, make sure TrafficStats has an appropriate context by
the time any client code can call the relevant methods.
• In app code, this achieved by passing the application
context from ActivityThread#handleBindApplication, before any
app code can run.
• In the system server, this is achieved by passing the context
right after creating service.
Test: atest TrafficStatsTest CtsWebkitTestCases
Bug: 204830222
Change-Id: I251bb8a4431ad12ff61929879ef1363cf06b9244
2022-01-22 01:01:49 +08:00
Hao Ke
d5b3a5c4a9
Merge "Changing readParcelable and readSerializable's method signatures."
2022-01-21 17:01:04 +00:00
Makoto Onuki
4a7c211539
[automerger skipped] Merge "*ServiceStartNotAllowedException shouldn't have a "cause"" into sc-v2-dev am: 74c9443579 -s ours
...
am skip reason: Merged-In I94ba39c775cf95074907db6814104289a577d496 with SHA-1 d4396b9a9d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16682150
Change-Id: I22526ab8af8a1f8db543ed18b3a5fbf8fea61e06
2022-01-21 16:15:28 +00:00
Makoto Onuki
e098aec346
Merge changes from topic "presubmit-am-8bb7303602ce4e5599c16939f20f4126" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] *ServiceStartNotAllowedException shouldn't have a "cause" 2p: d4396b9a9d
*ServiceStartNotAllowedException shouldn't have a "cause"
2022-01-21 16:04:24 +00:00
Makoto Onuki
74c9443579
Merge "*ServiceStartNotAllowedException shouldn't have a "cause"" into sc-v2-dev
2022-01-21 16:04:24 +00:00
TreeHugger Robot
b287cd5163
Merge "Allow extra keyguard logs to be enabled via adb" into sc-v2-dev am: c5e184b550
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16681376
Change-Id: I5f57d9ff1f71dd2e78af5e3accf7f5df6f5ffd46
2022-01-21 15:57:26 +00:00
Treehugger Robot
9e5539c793
Merge "Create owner test files for subpackages" am: 9e8cfbac2c am: 05bc30f21c am: a39bb54fdd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952387
Change-Id: I94c28df75a0af1ea24dcc388fee84c093268ffd0
2022-01-21 15:56:50 +00:00