Junyu Lai
e3f5ddc92b
Merge "Fix crash when incrementing data usage request" am: 641d6d1795
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117275
Change-Id: I1803a9ac64908668196bce3d464ca5ba7ebe0529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 11:17:30 +00:00
Junyu Lai
641d6d1795
Merge "Fix crash when incrementing data usage request"
2022-06-07 09:26:09 +00:00
Betty Chang
2e4249a884
Merge "To correct the title of the LE audio toggle in bluetooth settings" am: 7c92ca6de9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115074
Change-Id: I80e896d5d63be0e0a5185a24fb245a95ac6a3489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:13:56 +00:00
Betty Chang
7c92ca6de9
Merge "To correct the title of the LE audio toggle in bluetooth settings"
2022-06-07 07:48:45 +00:00
Junyu Lai
d629e84dbd
Fix crash when incrementing data usage request
...
This fixed a request leak problem which was introduced in previous
Android release but caught recently, where the budget of
MultipathPolicyTracker was cleaned before unregistering requests,
the logic in the tracker would skip the unregister if there is
no budget.
Test: MultipathPolicyTrackerTest#testOnThresholdReached
Bug: 233733267
Fix: 145963406
Change-Id: Icee43a4ee913a6459a47632f608fa6cb8b2ed4c2
Merged-In: Icee43a4ee913a6459a47632f608fa6cb8b2ed4c2
(pure cherry-picked from ag/18583185)
2022-06-07 11:15:05 +08:00
Peter Kalauskas
84347680b6
Add rahulbanerjee to OWNERS
...
Test: n/a
Bug: n/a
Change-Id: Ic59495472cbf8ce15eb15aa55de4f1de8c83b07b
2022-06-07 00:05:18 +00:00
Treehugger Robot
a375a95fd4
Merge "Fix owner files in text components in the widget directory" am: 5078370e5f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115546
Change-Id: I10ff5646a9168fa2a4737a680fd539bf8a3b4b60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:37 +00:00
Treehugger Robot
5078370e5f
Merge "Fix owner files in text components in the widget directory"
2022-06-06 22:28:04 +00:00
Steven Moreland
06e4550187
Parcel: warnings for 'REPLY' statuses
...
Comment a warning for this hack to add data into statuses. I've also
heard from jsharkey@ in the past a need for a generic solution here.
At a minimum, this prevents new bugs/bad interactions with native
code.
Bug: 235006086
Test: N/A
Change-Id: I3bcb2b8638803cde0f6ef257b65bb9456843abf7
2022-06-06 21:40:49 +00:00
Treehugger Robot
3609009963
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c17d8b4177 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116740
Change-Id: I267fe49a8e0fa82fdeb273453eb620e5af85dad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:20:03 +00:00
Bill Yi
ba15889cc6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c4c19120e -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116740
Change-Id: Icb1ff892b426f8924e90894e7ceea3e57dda78a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:19:50 +00:00
Treehugger Robot
d9d37e73ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 04dddbd1b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116738
Change-Id: I11bcb6e6aa0071bf32631722d39e811a5fa25701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:19:22 +00:00
Bill Yi
af17704454
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f93db9d41f -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116738
Change-Id: I68add50f508db55fe29a67505ec5f85a55c2a01e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:19:06 +00:00
Treehugger Robot
366b252424
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2ec2e742a0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117107
Change-Id: I3dc71b5dfae7d4b72286496f646aaa7dcac07c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:56 +00:00
Bill Yi
42999560cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44d012a3c6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117107
Change-Id: I607175967bbe13f37b1b9975226c133785b34f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:54 +00:00
Treehugger Robot
fd18b81722
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 783ff3d61e -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117101
Change-Id: If57b4305bf03980a92b1fd2110f1c50a21460a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:52 +00:00
Bill Yi
cb4119a8b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e977c40e12 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117101
Change-Id: I5d3ebbefcd4bf73f8e6160411fdf357b6ac2170f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:49 +00:00
Treehugger Robot
a2fe4b9c94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5aae84f7bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117097
Change-Id: I2dd3f2e6a70c6f020ac2f89c2484c002789515ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:47 +00:00
Bill Yi
ee3d56555b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ce58f3872 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117097
Change-Id: I61772ca5ef1165aa2640ad7244e157b08cdc4e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:41 +00:00
Treehugger Robot
c736de0e34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c17942709b -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117096
Change-Id: If7d233f7699fd4b099c6604578013474771a3ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:39 +00:00
Bill Yi
bf2af250a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 659a582b89 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117096
Change-Id: I84b7a4108a53a4519b9cf7297a2ff2a353428e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:38 +00:00
Treehugger Robot
1153611d53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: bb47e53c3f -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117095
Change-Id: I6ee22025f85cfd2a010e31a6ceaf409c4a158a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:35 +00:00
Bill Yi
efed969882
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35c522c3c0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117095
Change-Id: I661cfdf0dbe92b877a4315f574041e313f933ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:34 +00:00
Treehugger Robot
9458b64642
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c87816c2e8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117094
Change-Id: Ia0939c7721b3b21f9ede61bdf2dd9ebd66e5b9a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:32 +00:00
Bill Yi
fd27554f49
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbfc86d393 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117094
Change-Id: Ibd6da923bab3ca8301f5af467d63eb4b5fe47357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:24 +00:00
Treehugger Robot
cf8ee81978
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7c7688c679 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117093
Change-Id: I517ffba8c6dc5092875d368d8c330c5290b35812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:16:07 +00:00
Bill Yi
a459855570
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01c772b6a3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117093
Change-Id: Ia9d6a82349086cf8b9185681ceaf018ad7bc7ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:15:53 +00:00
Treehugger Robot
d3d417248b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fb3283d1c3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117073
Change-Id: I6d311bec23dafd7c755abbc3ddbef3b343f5ef6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:09:14 +00:00
Bill Yi
e1391492bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d23c081888 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117073
Change-Id: I065d1fbf03f8c0165e830cca3fbb7ea1c928fde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:09:05 +00:00
Treehugger Robot
d12132cc7f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9aa26b4c81 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117053
Change-Id: Ic77ea0ff782d22309c8bc9388eb5c5d5ade9720e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:57 +00:00
Bill Yi
926525f09f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 40705336a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117053
Change-Id: Ie19941db21a5771d6562e43cf8e0d2ff26962548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:48 +00:00
Treehugger Robot
7c5db86565
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1879096e9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116741
Change-Id: I483d8ceb44eeae9e551cd989bca101eb5d09c1f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:22 +00:00
Bill Yi
017fe8aee6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b69f37d7e -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116741
Change-Id: I20a8036727bcbc6c200befd0b926c265a3221402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:11 +00:00
Treehugger Robot
2984e46128
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3344fcc5f3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115572
Change-Id: Iac37dd1920d2f1da5a89ea04b799154c8f5fee9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:46 +00:00
Bill Yi
4182c711bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc63b9755a -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115572
Change-Id: If82aff6b75c247bcd4797be2e1a5a8d375701b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:45 +00:00
Treehugger Robot
37a6384478
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7e6fd8a17b -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115571
Change-Id: I22f3a68469c44d5c6f011c5bf5308a78e00c7133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:43 +00:00
Bill Yi
e0357ecc6e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c94af1f7ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115571
Change-Id: I515e6f06ece89e7725a46392981bbc4eab78c85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:41 +00:00
Treehugger Robot
92d6f1e2b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f34e81052b -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115570
Change-Id: Ie2b6b151175254fbc983a87e03f6c238cad60545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:39 +00:00
Bill Yi
b0cde9f0da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c761f63a -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115570
Change-Id: Ibac17bb3fcf51c38f3c65497fa4cfa5d93cadad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:37 +00:00
Treehugger Robot
edfec0408c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ae3aa3f9f3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115569
Change-Id: I3057344110211c1bb7ae5feba442e2d996b47ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:35 +00:00
Bill Yi
abc6399db7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7c171b175 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115569
Change-Id: I1f3d683b5e96d29767af56a8122d4998f2e7e6cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:33 +00:00
Treehugger Robot
2ce5dbb05e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 423c0fab11 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115568
Change-Id: I45b6407631e4a7672cc94d9a179df35d3504cb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:30 +00:00
Bill Yi
a2c26280a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6b08d117e -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115568
Change-Id: I57ad52d62615fbae2243fa685f6f4232028c38cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:20 +00:00
Treehugger Robot
a7c901550a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1d9c42c0e5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115566
Change-Id: I503bb6711518ec6889f0105c27c90667bcd16f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:04:16 +00:00
Bill Yi
9555f6a4e6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 871a5ef661 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115566
Change-Id: I2000256879e7303c84fd33a7d79f0892c1cd31c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:03:50 +00:00
Treehugger Robot
b9c6e735ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 26089f0efc -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115565
Change-Id: Ie71a271797538e3278591fdae9f6c473fae95363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:03:36 +00:00
Bill Yi
02a7304cd0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1e07b7d9c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115565
Change-Id: I67356b86e448f8f4b221dd07c23531bae98f6a3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:03:34 +00:00
Treehugger Robot
081becaf93
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1df82e79bb -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115564
Change-Id: I00f33070f7955cd2728362435ed1e488227f0e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:03:32 +00:00
Bill Yi
02e975867d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8316e21e3f -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115564
Change-Id: Iae834b54e1e5829730093225b876f16f32dfbc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:03:30 +00:00
Treehugger Robot
821dfa5773
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 64e65ae0e4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115563
Change-Id: I357063abe75890ae348ca49a7e3115f666760bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:03:28 +00:00