Commit Graph

10900 Commits

Author SHA1 Message Date
Thiébaud Weksteen
e371f9ace3 Merge "Add @JavaOnlyStableParcelable to AttributionSource" am: 5f5ff75870 am: 7228115341
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1908651

Change-Id: I24b6e309f896dfd9937f87739605c33d92c27cc6
2021-12-08 04:32:27 +00:00
Thiébaud Weksteen
7228115341 Merge "Add @JavaOnlyStableParcelable to AttributionSource" am: 5f5ff75870
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1908651

Change-Id: Ie151644aac4642ee16ee77a767bcc1c2f0e8306e
2021-12-08 04:16:08 +00:00
Thiébaud Weksteen
5f5ff75870 Merge "Add @JavaOnlyStableParcelable to AttributionSource" 2021-12-08 04:02:07 +00:00
Rhed Jao
828571b9c0 Merge "Fix the typos on the java doc" am: 63fed23659 am: ae0939cf4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909901

Change-Id: I7329e0d486e11d06f7df9325b3d53824bd5514e2
2021-12-06 08:04:59 +00:00
Rhed Jao
ae0939cf4a Merge "Fix the typos on the java doc" am: 63fed23659
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909901

Change-Id: I9773daadb710c87c1b2df5d5931d563e01b83d47
2021-12-06 07:41:17 +00:00
Rhed Jao
43509f3202 Fix the typos on the java doc
Correct "STMP" to "SMTP" in the java doc of the usesCleartextTraffic
attribute.

Bug: 181732244
Test: build
Change-Id: I7ffc81f3e201248f3b58dc5ee243a7cdd969fe23
2021-12-03 15:08:50 +08:00
Thiébaud Weksteen
ae4bf7dda6 Add @JavaOnlyStableParcelable to AttributionSource
Annotate AttributionSource with @JavaOnlyStableParcelable as it is
already available as part of the SDK.

Bug: 197828948
Test: atest --host aidl_unittests
Change-Id: I3e9343030947404239c9a963a529d246c57a04a1
2021-12-02 13:14:21 +11:00
Jon Eckenrode
abce82bc5d Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 am: 98951a99f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: Icb9a08416599e1dcad31e146a2b8f82bb1ef8281
2021-11-22 16:50:58 +00:00
Jon Eckenrode
98951a99f4 Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: I894941a064dc61c68722036081f0617c47804c83
2021-11-22 16:38:54 +00:00
Jon Eckenrode
92a4b54de5 Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." 2021-11-22 16:21:19 +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
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
Xin Li
10d9972786 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I13199bc39e9445929195f3d15579cbffe94e92b0
Change-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f
2021-11-18 17:00:37 +00:00
Treehugger Robot
f33b0154ca Merge "API docs clarification for placing calls." am: 57954552ad am: 043c9dee2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853624

Change-Id: I979f732e3fcecb1bba3b2384a0f46906751705af
2021-11-11 19:39:33 +00:00
Treehugger Robot
57954552ad Merge "API docs clarification for placing calls." 2021-11-11 19:07:28 +00:00
Jon Eckenrode
a05912b129 Reconciled description of WindowManager with description of Context#createDisplayContext().
Signed-off-by: joneckenrode <joneckenrode@google.com>
Change-Id: I428ab2c0303ebf6414a0e29ad844c1c52af2db43
2021-11-11 16:10:00 +00:00
Treehugger Robot
187863655c Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705

Change-Id: Icc99c2717305e6a17f04e1ca9651973491cb907b
2021-11-09 18:07:18 +00:00
Treehugger Robot
2512fc7380 Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705

Change-Id: I4dd38f5ba292d74d1660007374ad38d113782981
2021-11-09 17:47:08 +00:00
Yurii Zubrytskyi
4c87aec35f Update the resources owner files
Bug: 205633893
Test: n/a

Change-Id: Ib9cf70c9acb200e8019a6522cb6a85f85b760651
2021-11-08 16:25:33 -08:00
Treehugger Robot
3af00e82f8 Merge "Consolidating PM owner definition and adding new owners." am: 75e0091067 am: e32f384ce7 am: db319657ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863214

Change-Id: I4d3a530dc02b5258c9b040d34cdc310b3cba9304
2021-10-26 20:02:31 +00:00
Treehugger Robot
db319657ed Merge "Consolidating PM owner definition and adding new owners." am: 75e0091067 am: e32f384ce7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863214

Change-Id: I66e4e0c68812b58fd414652e80797444f86d5821
2021-10-26 19:36:39 +00:00
Treehugger Robot
75e0091067 Merge "Consolidating PM owner definition and adding new owners." 2021-10-26 18:39:51 +00:00
Treehugger Robot
fddbf6e930 Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" am: 168b5655a4 am: a3b55d5079 am: 170597987c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869964

Change-Id: I20da6815471e8e19813d16f9785d3238d29e46c1
2021-10-26 16:12:59 +00:00
Treehugger Robot
170597987c Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" am: 168b5655a4 am: a3b55d5079
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869964

Change-Id: Ic29bd0608b8a1edafc30834889f99107a5bfb9da
2021-10-26 15:58:18 +00:00
Treehugger Robot
168b5655a4 Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" 2021-10-26 15:32:33 +00:00
Etienne Ruffieux
255c70fbbc Revert "Removed BluetoothDevice#prepareToEnterProcess"
This reverts commit e8f2077fee.

Reason for revert: Introducing regression for gms core

Test: None
Change-Id: I644b10c1869c12e1622300de43bfbdb57fb583d8
2021-10-25 21:42:17 +00:00
Patrick Baumann
8255f5f4c0 Consolidating PM owner definition and adding new owners.
Change-Id: If4b080755701452c53d55f26380e887dc3944dbf
2021-10-19 21:06:56 +00:00
Treehugger Robot
5ee34126e5 Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21 am: 881188aec1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: I40e1ab47302e382037e42fb4f456fd15ef1d7576
2021-10-18 22:18:05 +00:00
Treehugger Robot
881188aec1 Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: Icfb47bbfd6a04323343d93cc4a7f636bc6c1f280
2021-10-18 22:05:26 +00:00
Treehugger Robot
e722500621 Merge "Removed BluetoothDevice#prepareToEnterProcess" 2021-10-18 21:37:57 +00:00
Treehugger Robot
821bb80688 Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861 am: dd769fedab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: Iff381892048ab02b6df2d92dc8d2c687b9f7bc88
2021-10-18 03:11:49 +00:00
Treehugger Robot
dd769fedab Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: Ib73d56621f5ba8f01917443a9aa1dd78812aa72c
2021-10-18 02:59:24 +00:00
Etienne Ruffieux
e8f2077fee Removed BluetoothDevice#prepareToEnterProcess
Tag: #feature
Bug: 200202780
Test: manual
Change-Id: I8d4be1da1bcb5b819c324f1a3a89c7dc317c31d6
2021-10-15 14:41:32 +00:00
Felka Chang
6829841745 Fix Configuration.diff documentation.
By using ActivityInfo.Config to annotate the return type of
Configuration.diff, it not only solves the wrong document but also
makes the documentation of Configuration.diff consist with
the documentation of Configuration.updateFrom.

The final result is the following.
```
Returns a bit mask indicating which configuration values have changed.
Value is either 0 or a combination of ActivityInfo.CONFIG_MCC,
ActivityInfo.CONFIG_MNC, ActivityInfo.CONFIG_LOCALE,
ActivityInfo.CONFIG_TOUCHSCREEN, ActivityInfo.CONFIG_KEYBOARD,
ActivityInfo.CONFIG_KEYBOARD_HIDDEN, ActivityInfo.CONFIG_NAVIGATION,
ActivityInfo.CONFIG_ORIENTATION, ActivityInfo.CONFIG_SCREEN_LAYOUT,
ActivityInfo.CONFIG_UI_MODE, ActivityInfo.CONFIG_SCREEN_SIZE,
ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE, ActivityInfo.CONFIG_DENSITY,
ActivityInfo.CONFIG_LAYOUT_DIRECTION, ActivityInfo.CONFIG_COLOR_MODE,
and ActivityInfo.CONFIG_FONT_SCALE
```

Test: make docs
Test: review reference/android/content/res/Configuration.html in
      out/target/common/docs/online-sdk-docs-docs.zip

Fixes: 171738297
Bug: 171716892
Change-Id: Iaa2ac25bc1269e4a9a625cce386f51984ffff923
2021-10-13 20:50:03 +08:00
Tyler Gunn
272fd21493 API docs clarification for placing calls.
Clarifying that a dialer app should use TelecomManager to place calls
instead of relying on the Intent#ACTION_CALL intent.

Test: Docs only change.
Fixes: 202033596
Change-Id: Iac9358c5cd069f120a167c96aa6b9462313b2268
2021-10-12 09:22:24 -07:00
Treehugger Robot
7b03023777 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908 am: cb329ca948
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: Ib1f1a23a5e3fcac9691db094f79e63b4415546b3
2021-10-06 12:55:15 +00:00
Treehugger Robot
cb329ca948 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I598b562401860e5e838f891eb2944e49becc2fe6
2021-10-06 12:35:43 +00:00
Treehugger Robot
3aaf984908 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I0aef93d99d83f20b22753e8e1d41cfb5c4b5cdce
2021-10-06 12:25:47 +00:00
Treehugger Robot
3ad4ecc296 Merge "Avoid full unparcelling where possible in Bundle" 2021-10-06 12:06:59 +00:00
Treehugger Robot
5476b13b48 Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846 am: 3b449c249f am: 407c8c4fc5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: Id6878f9cd849ec9ce6b2c582f5a640ef185774cf
2021-10-05 23:21:57 +00:00
TreeHugger Robot
c786f0e5ae Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb36 am: f81f06da29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889347

Change-Id: Ief894f1e36ddabdcfb9efe851ade4332ffcd9bac
2021-10-05 23:20:27 +00:00
Treehugger Robot
407c8c4fc5 Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846 am: 3b449c249f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: Ibbd974649418e4cc97668992be4af09026ff88d6
2021-10-05 18:49:07 +00:00
Treehugger Robot
3b449c249f Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: I8249e3a7426ee9f3d2d22ba6ae093d217980acc2
2021-10-05 18:36:56 +00:00
TreeHugger Robot
f81f06da29 Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889347

Change-Id: I4406ed3171a05afc52155faeb226fe4b66da2735
2021-10-05 17:32:24 +00:00
TreeHugger Robot
d34ebacb36 Merge "Use AttributionSource Builder" into stage-aosp-master 2021-10-05 17:17:13 +00:00
Jacob Hobbie
183e274d57 Fixing a build breakage caused by an incorrect link. Version code for
Android T doesn't exist yet, removing the link.

Test: presubmit, comments only, should just be "is build fixed"
Bug: 202151792
Change-Id: I2123f804aaed39eb7d31f25058c59a3c1df4d7d1
2021-10-05 09:11:39 -07:00
Alex Johnston
60be94ef59 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce am: 82b82e3a73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I042c8fbba177a506068183be34fe8a3d053ada99
2021-10-05 15:54:53 +00:00
Alex Johnston
82b82e3a73 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I3d56b09b853516237428e695a21ab263722952bd
2021-10-05 15:23:58 +00:00