Commit Graph

14267 Commits

Author SHA1 Message Date
Josh Gao
a1b7331722 Merge "Add proto tombstones to Dropbox." am: 3361ca6c56 am: 093e8d266a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590892

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I828d8f22f643513cce2841470e272cc22231b138
2021-02-18 10:24:39 +00:00
Josh Gao
3361ca6c56 Merge "Add proto tombstones to Dropbox." 2021-02-18 08:41:55 +00:00
Josh Gao
f4c51f3771 Add proto tombstones to Dropbox.
Bug: http://b/159164105
Test: treehugger
Change-Id: I9f14482f693c9645d72a93d4a966909bf797533a
2021-02-17 17:40:49 -08:00
Treehugger Robot
f7678be6bf Merge "Cleanup of Zygote files" am: 6fca4110dc am: c91fb923a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590611

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43db62c8e3a3f648f45cc985d132437af6759c3c
2021-02-16 21:19:14 +00:00
Chris Wailes
c31c4f9b31 Cleanup of Zygote files
This CL cleans up some warnings in the ZygoteInit.java and
ZygoteServer.java files.  These warnings were mostly about unused
variables, protection class changes, and dead code.  Some changes
to code in Zygote.java and ZygoteConnection.java were needed due to
function signature changes.

Test: Built and booted image
Merged-In: I6ba33cfcb4729a75dbbd4f908f4b46110d3bb991
Change-Id: I6ba33cfcb4729a75dbbd4f908f4b46110d3bb991
2021-02-16 10:23:47 -08:00
Benjamin Franz
8964ef6743 Merge "Add versioning to app compat framework" am: 80bbdfd100 am: 4fb9af6ced
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b38edb7136852c5ecf78e0a4ad0266c77a453a
2021-02-16 12:51:34 +00:00
Benjamin Franz
80bbdfd100 Merge "Add versioning to app compat framework" 2021-02-16 11:48:36 +00:00
Benjamin Franz
360d60d523 Add versioning to app compat framework
With this change, callers can set overrides for specific versions of an
app. The framework falls back to default version when the given version
doesn't have an override set.

Bug: 174043039
Test: atest FrameworksServicesTests:CompatConfigTest
Test: atest FrameworksServicesTests:PlatformCompatTest
Test: atest PlatformCompatGating
Change-Id: Ib5ff67e752a9c5ee94b6e1dd664d324ab5bf4542
2021-02-11 18:33:45 +00:00
Mitch Phillips
e399fb29d4 Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575891

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d5a38c75adbda0553e81235f49aa0aef7a8a3b
2021-02-08 19:43:53 +00:00
Jeff Sharkey
0192f22a73 Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe90565c3df31a79bafa5a958a4df1ac1192fb0
2021-02-08 19:43:24 +00:00
Mitch Phillips
4d7b7a71d6 Merge "[MTE] Parse MTE sysprop in system_server" 2021-02-08 18:46:52 +00:00
Jeff Sharkey
1cf122b5a7 Merge "Add OWNERS for CPU-related files" 2021-02-08 18:31:18 +00:00
Treehugger Robot
b371a1c255 Merge "Do not propogate test api access flags to Zygote." am: 39d22680c9 am: 756d229f09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1dabacbcd75c98ab81f933ba03f8f97720ba69b6
2021-02-08 17:23:55 +00:00
Rafal Slawik
ebc11b5899 Add OWNERS for CPU-related files
This covers files from CLs like:
- http://ag/13495669
- http://ag/13425120
- http://ag/13201721

Bug: n/a
Test: n/a
Change-Id: I7b1ba4e75c57cf53a9fe8b479b9472f627a63e82
2021-02-08 16:53:22 +00:00
Treehugger Robot
39d22680c9 Merge "Do not propogate test api access flags to Zygote." 2021-02-08 15:27:19 +00:00
Treehugger Robot
255e25fcc3 Merge "Fix a bug in the USAP Pool refill logic." am: 905c2570cd am: 8151e4c800
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d24c25a0ab4bde791d1ddba37b9f59c1c1b6bb7
2021-02-07 20:40:38 +00:00
Treehugger Robot
905c2570cd Merge "Fix a bug in the USAP Pool refill logic." 2021-02-07 19:52:20 +00:00
Josh Gao
b4d05a90e9 Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22b7d2e823d131944d5b02996b8e3e92d2bbc2fa
2021-02-05 21:13:20 +00:00
Josh Gao
ddaf564365 Merge changes I8b85d8ee,I789f41f1
* changes:
  Parse proto tombstones.
  Extract tombstone tracking to a separate service.
2021-02-05 20:11:10 +00:00
Jeff Sharkey
d6e31fbd8b Merge "Add People widgets to those owned by System UI Notifications team" am: 460b1255a9 am: c088d267a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577069

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddda0182bbb83b493073a0582d8da539e96acb62
2021-02-05 19:27:33 +00:00
Jeff DeCew
d5e38f04bb Add People widgets to those owned by System UI Notifications team
Change-Id: I15afb8f80a3d067af522707748a5b07c015af138
2021-02-05 14:09:02 +00:00
Mitch Phillips
b8d053a815 [MTE] Parse MTE sysprop in system_server
The system server inherits the ELF note from the Zygote, but should also
be able to be overwritten by the system property. This needs to be
manually parsed.

Bug: 172365548
Test: 'adb shell setprop arm64.memtag.process.system_server 123' \
Test: ... kill the system_server, and and look in logcat for
Test  ... "Unknown memory tag level for the system server".
Test: 'adb shell setprop arm64.memtag.process.system_server sync' \
Test: ... kill the system_server, and look in logcat for
Test: ... "SetHeapTaggingLevel: tag level set to 3".

Change-Id: Icda4ff141646086ae85d751b8af9b1fe94bfd7b5
2021-02-04 15:28:07 -08:00
Artur Satayev
bff33b8c31 Do not propogate test api access flags to Zygote.
The flow has been replaced by @ChangeId ALLOW_TEST_API_ACCESS, making
old approach obsolete.

Bug: 147113465
Test: atest CameraEvictionTest#testBasicCamera2ActivityEviction
Merged-In: I0bf109fa78212d6d71ba85d25f80e27e8e7cd900
Merged-In: I0e58b6924744590afaadec6a6230aa9d552b2f6f
Change-Id: I9cf8f80abb0165d4aefbf943bade57f5e031904b
Exempt-From-Owner-Approval: cp
Bug: 178391911,147113465
(cherry picked from commit a27cd30535)
2021-02-04 17:17:44 +00:00
Bill Yi
46b48bcc66 Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
Merged-In: Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d
Merged-In: I2cb57c40fd5679dbd710396f3c69deafbac9d1c3
Change-Id: Ibfd6d85bda975aaa274be9e98e197de048d178ac
2021-02-03 17:01:38 -08:00
Josh Gao
9a8b4358d3 Extract tombstone tracking to a separate service.
In preparation for making tombstones available to apps, extract the
tombstone tracking code from BootReceiver to its own service.

Bug: http://b/159164105
Test: manual
Change-Id: I789f41f12a8be312b6e966226646c4ec4becc1aa
2021-02-03 14:08:12 -08:00
Chris Wailes
6a2b1afa6a Fix a bug in the USAP Pool refill logic.
This CL addresses a bug in the USAP Pool refill logic that could cause
refill events to be delayed indefinitely.  This would not prevent future
refill events from triggering, but could cause temporary degradation in
USAP performance.

Test: launch applications from USAP pool and inspect log
Bug: 177795408
Merged-In: I2e46eae431a1d9671d31c29b3552cd0287c66239
Change-Id: I2e46eae431a1d9671d31c29b3552cd0287c66239
2021-02-03 13:27:40 -08:00
Miranda Kephart
e4081d74ad [DO NOT MERGE] Close screenshot process on user switched am: 05f7aef1b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13070635

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0de430aa000f81f00da2e64799d17810d506a737
2021-02-03 17:00:54 +00:00
Jeff Sharkey
b7cd95098f Merge "Add core notifications team as owners of internal notification widgets." am: 752040bead am: 6b3ed78bf6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571164

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7133f6b8f758f6a37973691aea5e1ea2386a848b
2021-02-03 15:54:28 +00:00
Jeff Sharkey
6b3ed78bf6 Merge "Add core notifications team as owners of internal notification widgets." am: 752040bead
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571164

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ced104b3622d406e0eefe64aa311ab5970ccc02
2021-02-03 15:30:13 +00:00
Jeff DeCew
c879d183a8 Add core notifications team as owners of internal notification widgets.
Change-Id: Ie1a8e61f8c250340083940af866552e0d15851dd
2021-02-03 01:07:21 +00:00
Bill Yi
e02a98aab6 Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE
Merged-In: Ie9567c088e4fff075cce5b6f44bd73199377c91b
Change-Id: I3a2480f2cb8331a70141dad9af61ac3fd7f39991
2021-02-02 09:54:38 -08:00
Jeff Sharkey
db00fbb7b3 Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" am: 0db5d441ad am: f486d1dc63
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1568920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4e04f57ef860e64e5b3af541067c5d163abc7f1
2021-02-02 00:44:46 +00:00
Dmitri Plotnikov
1ef5d3f87e Add BATTERY_STATS_OWNERS for IBatteryStats.aidl
Change-Id: Iffb8ded9ff5edc899ab38c74ffe3ad98793ca67c
2021-02-01 23:42:59 +00:00
Treehugger Robot
8172883202 Merge "Note network interfaces based on transport" am: 8334a265ad am: cd65235a77
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I444343c7230c0f947a666334fb895736fa4bc153
2021-01-28 09:02:21 +00:00
Treehugger Robot
8334a265ad Merge "Note network interfaces based on transport" 2021-01-28 07:45:20 +00:00
Remi NGUYEN VAN
2c9ed7f32d Note network interfaces based on transport
Instead of classifying interfaces by network type in BatteryStats,
classify them based on the transports array provided by the
NetworkAgent.

Network types are deprecated and transports should be used instead. This
change allows BatteryStats to stop depending on unstable APIs such as
isNetworkTypeMobile.

This change also updates nullability annotations in ConnectivityService
and NetworkAgentInfo to show that the NetworkCapabilities are non-null
(as provided by the network agent) when calling
noteNetworkInterfaceTransports.

Bug: 174436414
Test: atest
  atest ConnectivityServiceTest#testBatteryStatsNetworkType \
      --rerun-until-failure 40

Merged-In: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8

Change-Id: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8
2021-01-28 15:10:54 +09:00
Miranda Kephart
05f7aef1b0 [DO NOT MERGE] Close screenshot process on user switched
Currently, we keep the process up even if the user switches,
meaning that in some cases (if the user is switched while the
screenshot UI is up) we will save images to the wrong profile.
This change makes ScreenshotHelper listen for user switches and
close the screenshot service, so that a new screenshot is
guaranteed to be constructed with the correct user's context.

Bug: 170474245
Fix: 170474245
Test: manual -- verified bad state occurs if user switches within
the timeout period, ensured that screenshots work immediately
after switching with this change.

Change-Id: I9d32d0928e6c2bda161d04555438d0dd7afef0ba
(cherry picked from commit 7ef1a5dd15)
2021-01-27 23:16:21 +00:00
Treehugger Robot
046ebf41b7 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 am: b0989fd2d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
2021-01-27 13:57:34 +00:00
junyulai
fa528b2d20 [FUI03] No-op refactoring of VpnInfo
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
  1. Move VpnInfo to android.net
  2. Add nullability annotations
  3. Make members final

Bug: 174123988
Test: TH
Change-Id: I1530bb45d0e84c28c6deac33596bc686058afc0d
2021-01-27 15:03:06 +08:00
Jeff Sharkey
6b2d1bb8c4 Merge "Add the owner for those files related to voice." am: 24bbd50cea am: 2a0549bc14
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55d845133463c0e20cfa761a7c18ad50cd3f1dd2
2021-01-26 00:08:05 +00:00
Jeff Sharkey
24bbd50cea Merge "Add the owner for those files related to voice." 2021-01-25 19:21:12 +00:00
Seigo Nonaka
6997779819 Merge "Add OWNERS for font manager related module" am: 61bb2cfccc am: 63c0ffd31e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557448

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic814c65f7885d9f1b0f25adcf6fdf1f7dab44cb4
2021-01-25 17:17:30 +00:00
Seigo Nonaka
580f6ddeb2 Add OWNERS for font manager related module
Bug: N/A
Test: N/A
Change-Id: I8a653349bd6df6365e1d6cbb2fc3b3ac10c8fcd7
2021-01-22 10:07:27 -08:00
lpeter
7593a84876 Add the owner for those files related to voice.
Bug: 177641730
Test: n/a
Change-Id: Ib693e399efd14acbc00a83421e1bff77fede6cd6
2021-01-22 20:49:30 +08:00
Kohsuke Yatoh
782d427971 Merge "Add missing textservice OWNERS files." am: 0f4112a760 am: 49023f3cd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifeae70e9e0e68b1f0420c95676c3a2445c9433ef
2021-01-21 01:00:21 +00:00
Kohsuke Yatoh
0f4112a760 Merge "Add missing textservice OWNERS files." 2021-01-20 23:16:33 +00:00
Kohsuke Yatoh
b1d2fe86f7 Add missing textservice OWNERS files.
Test: n/a
Change-Id: I56939ce3a22c72ac489e4d9248de9e0ce4ee9413
2021-01-20 18:53:11 +00:00
satayev
311ed3bc6a Merge "Allow clearing a single change id for tests usage." am: 2805c99594 am: 3bbe9c336f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie864851627231669743899b8e0d110635cee6c60
2021-01-20 18:49:03 +00:00
satayev
1c8e894bd8 Merge "Refactor PlatformCompat and related files." am: 5d37ff2d33 am: 3cfd32b11f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553536

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia183bbd2338415608ad962e80336e05bc6d99612
2021-01-20 18:48:02 +00:00
satayev
2805c99594 Merge "Allow clearing a single change id for tests usage." 2021-01-20 17:48:52 +00:00