Anton Hansson
41d0224165
Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f20
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446816
Change-Id: I49f537f11f0e00b058274365622b844f55223fd0
2020-10-05 12:59:40 +00:00
Anton Hansson
70defe1cdb
Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635
Change-Id: I6ef1bfbf4dcd39983e94207ff7f760e152da2a97
2020-10-05 12:56:06 +00:00
TreeHugger Robot
7e335c887e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-05 12:49:16 +00:00
Anton Hansson
c2ee800f20
Merge "Re-submit "Add genrules for merged removed.txt files""
2020-10-05 12:48:39 +00:00
Treehugger Robot
e13d2abfb9
Merge "Build stub libraries with smaller deps" am: 68d17855ea am: 88c2c1aa6f am: 1ed5aad300
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440213
Change-Id: I9e438e107e5d505ac8bbe89501d774aedb3c04a5
2020-10-05 12:36:38 +00:00
Bill Yi
d16837145a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5293709d51d89ee1b72340ead8159c177e484c97
2020-10-05 05:32:16 -07:00
Anton Hansson
c29f606cc7
Merge "Explicitly reference framework-wifi app build rule"
2020-10-05 12:27:45 +00:00
Treehugger Robot
1ed5aad300
Merge "Build stub libraries with smaller deps" am: 68d17855ea am: 88c2c1aa6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440213
Change-Id: I8202f5de8d08fcf337c8a842c289f857ebfa172c
2020-10-05 12:12:54 +00:00
Bill Yi
56cc51a96c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0b5e701d63655d8d12f7b4c817a2132814e90113
2020-10-05 05:04:27 -07:00
lucaslin
9226fc3723
Fix storing the wrong value of mLockdown in setting
...
When user is stopped, the Vpn#onUserStopped() will be called and
the value of mLockdown will be set to false then store into
setting.
This is a wrong behavior because user doesn't change it, so for
this kind of case, there is no need to store the value of
mLockdown in setting.
In fact, there is no need to call Vpn#saveAlwaysOnPackage() when
user is stopped because there is nothing changed.
Bug: 168500792
Test: atest FrameworksNetTests
Change-Id: Ie85a347216614b7873bfdf199165d89527ada3a8
2020-10-05 12:03:28 +00:00
Treehugger Robot
88c2c1aa6f
Merge "Build stub libraries with smaller deps" am: 68d17855ea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440213
Change-Id: Id291b67b85d4c14452f86cfdc11e4a1db721aeec
2020-10-05 11:37:22 +00:00
Bill Yi
f425128f4e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I91d659650091d779662c0f1b25273ce06af23751
2020-10-05 04:36:05 -07:00
Treehugger Robot
68d17855ea
Merge "Build stub libraries with smaller deps"
2020-10-05 11:17:01 +00:00
Treehugger Robot
d609fa5d99
Merge "Reconnect CEC HAL callback" am: f1df6bf33a am: 70c1c7069f am: 339cefd32a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871
Change-Id: I06cb30773d309fed7bdbc108003d0db5e0e567b4
2020-10-05 10:54:01 +00:00
Anton Hansson
35d5ae3aa0
Explicitly reference framework-wifi app build rule
...
This works around a build-system limitation where it does not know
which jars to feed r8 to resolve all classes during proguarding.
Bug: 160453030
Bug: 169931783
Test: build_mainline_modules.sh (with prebuilt sdk)
Change-Id: I3d9f2049cf898b5e551a5c5764df423abaa5e92d
Merged-In: I3d9f2049cf898b5e551a5c5764df423abaa5e92d
2020-10-05 11:43:39 +01:00
Treehugger Robot
339cefd32a
Merge "Reconnect CEC HAL callback" am: f1df6bf33a am: 70c1c7069f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871
Change-Id: I62b4af1673c460375d4929991146218beeadc0e4
2020-10-05 10:27:25 +00:00
Treehugger Robot
70c1c7069f
Merge "Reconnect CEC HAL callback" am: f1df6bf33a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422871
Change-Id: I1dcb74c11b66eb9e6fb26b366bb1ccde399cc772
2020-10-05 10:05:45 +00:00
Treehugger Robot
f1df6bf33a
Merge "Reconnect CEC HAL callback"
2020-10-05 09:38:35 +00:00
Jiyong Park
c0f8a28e54
Build stub libraries with smaller deps
...
The stub libraries had a dependency to framework-internal-util which is
a collection of java static libraries whose source code is
auto-genmerated (e.g. via protoc, aidl, etc.)
The library was added as a dependency because some Java files that are
fed into the metalava for the stub code generation have references to
some of the auto-generated symbols. However, this is more than
necessary. Furthermore, that setup will create a circular dependency
when framework-internal-utils (or its transitive dependencies) have a
dependency to the stub libraries due to 'sdk_version' setting.
Fixing the problem by replacing the dependency to
framework-internal-util with a few number of libraries.
Bug: 169618843
Test: m
Change-Id: I30c953ed220e84ab295548845fff0b26e3c060b6
2020-10-05 18:30:33 +09:00
Yo Chiang
569c31cef6
Dismiss DSU notification in executeDiscardCommand()
...
Dismiss notification even if there is no active DSU installation.
Bug: 170072953
Test: Install a DSU system.
Reboot into guest system and reboot back to host system.
`adb shell gsi_tool wipe`
Press "Discard" in the DSU notification, the notifiction is dismissed.
Change-Id: I6f217c4ba287e4789d61182a12485db60f9605c9
2020-10-05 08:57:50 +00:00
Bill Yi
c99d1d77e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c4cbae23bd3017e3730f8d64e3becf67f40b92e
2020-10-05 00:28:12 -07:00
Bill Yi
c7be32a1b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I923ae5fe5c949911dc0b49cc9ad43dbbbf448431
2020-10-04 23:33:11 -07:00
Remi NGUYEN VAN
6387974158
Move IpUtils to frameworks/libs/net
...
The utility classes are useful for mainline modules and their tests, for
example IpClientIntegrationTest.
Bug: 168868607
Test: m && atest NetworkStaticLibTests
Change-Id: If2b1613aa18a7990391e2d31cc2951ca93f1cf3c
2020-10-05 14:38:19 +09:00
Treehugger Robot
e6e08b9836
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97 am: 9cd671a4a2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: Idbbe5128c77d67040deb197e3437bf81abf8c1ad
2020-10-05 05:15:35 +00:00
Treehugger Robot
9cd671a4a2
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: I70b49d0a10b80f378dcd2ba78b5bac848e40e5c9
2020-10-05 04:46:25 +00:00
Bill Yi
f76f597199
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I706a3301c7832d6aa29fd0a725eb01b9c5894690
2020-10-04 21:42:57 -07:00
Treehugger Robot
004f473e97
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: I0a5398513c4572db839e3713109bb326f0261954
2020-10-05 04:26:10 +00:00
Treehugger Robot
0989373740
Merge "Make PrivateAddressCoordinator ignore vpn network"
2020-10-05 04:10:48 +00:00
Chris Ye
f624d6d026
Add OnLive Universal Controller media buttons mapping.
...
Add media buttons like play/pause/record etc, for OnLive
Universal Controller.
Bug: 114679349
Test: Connect OnLive Universal Controller and play with media
buttons.
Change-Id: Ie69b3f7f8f13c778208454fb789113126c04966a
Merged-In: Ie69b3f7f8f13c778208454fb789113126c04966a
2020-10-02 18:06:34 -07:00
Dean Wheatley
ede3f24c8d
Default compressed audio bytes per sample to 1
...
To support AudioTrack builder for compressed audio (e.g. AC3) without
specifiying setBufferSizeInBytes, default the bytesPerSample to 1, and
handle the possible getBytesPerSample exception.
Test: atest AudioTrackTest#testAc3BuilderNoBufferSize
Bug: 169875806
Change-Id: I1b28d94c4dbf3a72e807ef445163e1dd84e4553b
2020-10-02 22:29:19 +00:00
Tyler Gunn
c99d9173d6
Make android.telecom.action.POST_CALL a protected broadcast.
...
Ultimately we only want Telecom to be able to broadcast this and use it
to open an activity in an app implementing the CallScreeningService API.
Test: Added CTS permissions verifier test to confirm this is protected.
Bug: 169834488
Change-Id: I0ca1b680b6bacc2597a59714b2c1a3363fe8057f
2020-10-02 18:24:53 +00:00
Steven Moreland
e143e071d1
Merge "Move AIDL files to declared packages." am: 1f125fcd66 am: 66f6e3d77e am: 89d60ad686
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445648
Change-Id: I7facecc0e6306e4c22d9b9b23d116c982197a38f
2020-10-02 18:03:08 +00:00
Steven Moreland
89d60ad686
Merge "Move AIDL files to declared packages." am: 1f125fcd66 am: 66f6e3d77e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445648
Change-Id: Ibb810b6c18f3951679092072fc9f587acd7cf660
2020-10-02 17:35:21 +00:00
Steven Moreland
66f6e3d77e
Merge "Move AIDL files to declared packages." am: 1f125fcd66
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445648
Change-Id: Ic242d4f6e5808af93d97729b8906c2a62a6de94c
2020-10-02 16:58:15 +00:00
Anton Hansson
3c1aa119fc
Re-submit "Add genrules for merged removed.txt files"
...
No diffs vs monoliths. The TARGET_BUILD_APPS issue has been fixed.
Bug: 169034951
Test: for p in "" "system-" "module-lib-"; do
for t in "current" "removed"; do
echo "${p}${t}:"
echo "$(diff -u0 \
<($CANON frameworks/base/api/${p}${t}.txt | sort) \
<($CANON out/soong/.intermediates/frameworks/base/api/frameworks-base-api-${p}${t}-merged.txt/gen/${p}${t}.txt | sort))"
done
done
(cherry picked from commit cfb26e3b4c )
Change-Id: I1f637b69d96c0b86f4f30da6b68f06a382e50d28
2020-10-02 17:48:07 +01:00
Steven Moreland
1f125fcd66
Merge "Move AIDL files to declared packages."
2020-10-02 16:37:24 +00:00
Rick Yiu
765dbc6b67
Merge "Revert "Refine documentation for Process.setThreadPriority"" am: fe6160ab9c am: 1cb565ec3c am: 017adb4085
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440031
Change-Id: Ib3da013ce94288729a2b2d177fcc4d2345e1af58
2020-10-02 13:47:00 +00:00
Rick Yiu
149f54eb11
Merge "Revert "Implement the ThreadPrioritySetter interface"" am: b01d0fe127 am: f7ac1ee91d am: 05a7df810c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440013
Change-Id: I1c8d127cfa36748cc6115414c9887ecaec731a02
2020-10-02 13:46:49 +00:00
Rick Yiu
017adb4085
Merge "Revert "Refine documentation for Process.setThreadPriority"" am: fe6160ab9c am: 1cb565ec3c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440031
Change-Id: I1715fe8876ad912282114a2d3db531fdfe577655
2020-10-02 13:15:24 +00:00
Rick Yiu
05a7df810c
Merge "Revert "Implement the ThreadPrioritySetter interface"" am: b01d0fe127 am: f7ac1ee91d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440013
Change-Id: Ic36f19df3a28d502f72a00ac41e25ddfb7011949
2020-10-02 13:15:21 +00:00
Rick Yiu
1cb565ec3c
Merge "Revert "Refine documentation for Process.setThreadPriority"" am: fe6160ab9c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440031
Change-Id: Ib2734db1b8a0e162088410fa7264ad8f1a5c4519
2020-10-02 12:42:23 +00:00
Rick Yiu
f7ac1ee91d
Merge "Revert "Implement the ThreadPrioritySetter interface"" am: b01d0fe127
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440013
Change-Id: I86bc5d62772106bef25087ab04fb1756bc03558e
2020-10-02 12:40:28 +00:00
Rick Yiu
fe6160ab9c
Merge "Revert "Refine documentation for Process.setThreadPriority""
2020-10-02 12:23:53 +00:00
Rick Yiu
b01d0fe127
Merge "Revert "Implement the ThreadPrioritySetter interface""
2020-10-02 12:23:53 +00:00
Treehugger Robot
58c615fbaa
Merge "FileBridge: fix fd ownership mismanagement." am: e80c7cb69a am: bc2ef840e1 am: 5cc3eac681
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433025
Change-Id: Ic3b714e1e80c4a9ced5373f1490d77ce80cd868c
2020-10-02 00:46:23 +00:00
Treehugger Robot
92bcee154f
Merge "Parcel interface token methods @NonNull." am: 403f00bfb8 am: f74b2d4192 am: 008ff2619b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444678
Change-Id: I08fb4d9849f38737528924fdc75944d362f1d9f5
2020-10-02 00:45:23 +00:00
Treehugger Robot
5cc3eac681
Merge "FileBridge: fix fd ownership mismanagement." am: e80c7cb69a am: bc2ef840e1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433025
Change-Id: I5016af13c2b9ee3032daa345b82f7479a6ba5072
2020-10-02 00:02:19 +00:00
Treehugger Robot
008ff2619b
Merge "Parcel interface token methods @NonNull." am: 403f00bfb8 am: f74b2d4192
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444678
Change-Id: Ie1f7f8707dfda71df646c1363a1a7e238301838d
2020-10-02 00:01:22 +00:00
Treehugger Robot
bc2ef840e1
Merge "FileBridge: fix fd ownership mismanagement." am: e80c7cb69a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433025
Change-Id: Iab74aa9ba074f6c953d658a12103e5e74a9ea13c
2020-10-01 23:44:09 +00:00
Treehugger Robot
f74b2d4192
Merge "Parcel interface token methods @NonNull." am: 403f00bfb8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444678
Change-Id: Ica39b914561ef61fb15ba06de9451a08c9102d4c
2020-10-01 23:39:55 +00:00