Commit Graph

386598 Commits

Author SHA1 Message Date
Treehugger Robot
c07aed0fd4 Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN" 2019-08-30 15:05:31 +00:00
Treehugger Robot
946e857c71 Merge "Fix reversed logic" 2019-08-30 14:03:51 +00:00
Treehugger Robot
a067de365a Merge "Cut the dependency to framework from droiddoc modules" 2019-08-30 13:47:31 +00:00
junyulai
465088ed2f Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN
When resetting legacy Always-On VPN, the intent is handled by
main thread. And it will also initialize VPN shutdown process,
which will cause networkInfo changed event on
ConnectivityService internal thread. These two events need to
hold their corresponding lock and ask for the other one, which
causes the deadlock.

This patch move the event handling to the same thread to prevent
such deadlock, and cleanup some unused variables.

Change-Id: I5b656c0d0381acb4e33409a11f502db9b180296c
Fix: 139122208
Test: atest FrameworksNetTests, manual test
2019-08-30 19:56:59 +08:00
Treehugger Robot
bef5d2165d Merge "Run callbacks on ConnectivityService thread" 2019-08-30 10:18:28 +00:00
Jiyong Park
ab6d165763 Cut the dependency to framework from droiddoc modules
droiddoc modules for the SDK API documentation and stubs library
generations have depended on the 'framework' (which was recently changed
to framework-minus-apex' module to get the list of Java source files to
be processed.

This however caused a circular dependency when we tried to modularize
some classes in the framework library as a separate library. The
separate java library depended on the stubs library (because it should
only use SDK APIs) and the stubs library depended on the framework
library. The framework library itself depended on the separated library
(or its stub) to use APIs from the separated library, thus forming a
circular dependency.

This change fixes the problem by directly giving the framework source
files via a filegroup `framework-sources-to-document` where all Java
and AIDL files that are to be documented are included in.

This change also put the generated R.java and Manifest.java files from
framework-res into the filegroup for framework sources.

Bug: 70046217
Bug: 135922046
Test: m
Exempt-From-Owner-Approval: Approved internally
Merged-In: I09ad88da47540d31ad089aad5e1151a4b6877ec2
(cherry picked from commit 20426538f8)
Change-Id: I09ad88da47540d31ad089aad5e1151a4b6877ec2
2019-08-30 08:28:43 +00:00
Yi Kong
f69c334dea Fix reversed logic
To check if a value falls in a range, it should be
  a >= MIN && a <= MAX
instead of
  a >= MIN || a <= MAX

Found by an experimental Clang warning change,
https://reviews.llvm.org/D66044.

Test: presubmit
Change-Id: I91e2a04687285d9311fd831197c73af38ec8379c
2019-08-30 02:09:30 +00:00
Mathieu Chartier
4082bc010b Merge "Clean up class preloading" 2019-08-29 21:52:42 +00:00
Mathieu Chartier
83bea97333 Clean up class preloading
Remove logic to set heap target utilization to 0.8. The default is
0.75 and this should not have any fragmentation benefit since the
GC is compacting.

Removed some unused logging and a variable.

Test: TH

Change-Id: Ife7219e94fa0aa7f489569e16248cdd23d09089a
2019-08-29 12:03:09 -07:00
Anna Trostanetski
cc55cca985 Merge "Remove prefix property from platform_compat_config module" 2019-08-29 16:57:34 +00:00
atrost
7aa64a78ae Remove prefix property from platform_compat_config module
It's no longer needed as the configs moved to their own directory. Also CompatConfig now reads from the new location.
Bug: 140074769
Bug: 140092095
Test: m, atest FrameworksServicesTests

Change-Id: Ia800a63096693717b027c7291dc8005ca1c93fe5
2019-08-29 14:22:13 +01:00
Tobias Thierer
aff95e5e7c Merge changes from topic "bug136256059_revert"
* changes:
  Revert "Move default MimeMap implementation to frameworks."
  Revert "Tweak RuntimeInit docs around MimeMap registration."
2019-08-29 10:05:20 +00:00
Chalard Jean
da5685428a Merge "Opportunistic cleanup" 2019-08-29 04:33:44 +00:00
Tobias Thierer
f83bd777f3 Revert "Move default MimeMap implementation to frameworks."
This reverts commit 53f15f39f8.

Reason for revert: Caused slower app startup (I don't know why).

Change-Id: Id9e3811078bc435073f42996767589a711172400
2019-08-28 22:43:33 +00:00
Tobias Thierer
89bcfa5a21 Revert "Tweak RuntimeInit docs around MimeMap registration."
This reverts commit 098a533e78.

Reason for revert: Base CL caused slower app startup (I don't know why).

Change-Id: Ib67852b900ff2baeb34f5d553fb0d233f5475888
2019-08-28 22:43:06 +00:00
Brad Ebinger
597234f119 Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP" 2019-08-28 22:02:44 +00:00
Amit Mahajan
2c8d3c56f2 Merge "Fix invalid padding bits for 7-bit ASCII encoding" 2019-08-28 19:45:52 +00:00
Treehugger Robot
1953ea490f Merge "SDK API doesSwitchModemConfigTriggerReboot" 2019-08-28 17:51:50 +00:00
Treehugger Robot
c55eedf2a3 Merge "Add OWNERS file to textclassifier directory" 2019-08-28 17:47:28 +00:00
Tony Mak
a14d1dd67c Add OWNERS file to textclassifier directory
Test: None

Change-Id: I95613d36b19d34889d9747b21c65e3ddc54a8474
2019-08-28 15:52:49 +00:00
Luke Huang
6fecb94292 Merge "Support enable/disable dns forwarding of dnsmasq when start tethering" 2019-08-28 12:53:16 +00:00
Chalard Jean
f7742a20b0 Opportunistic cleanup
Both these members are always null. If iface is non-null, this
condition is false. If iface is null, then sourceAddrs can't
be null else NPE, but if it's not null it's not equals(null)
so this condition is necessarily always false.

Bug: None
Test: FrameworksTestsNet NetworkStackTests
Change-Id: Iedda059e516f1816edfe942790bc3c42d78fe748
2019-08-28 20:55:04 +09:00
Mark Chien
751f034b82 Merge "Passing caller package name to setBluetoothTethering" 2019-08-28 09:59:27 +00:00
Treehugger Robot
0280bd3970 Merge "No need PDU data for deleteMessageFromIcc()" 2019-08-28 08:01:30 +00:00
Treehugger Robot
7a71de717b Merge "Add new default_reserved_data_coding_scheme config" 2019-08-28 07:57:29 +00:00
Taesu Lee
bc7abc3e5a Preprocessing Teleservice Id 0xFDEA SMS WAP
The SMS WAP specified Teleservice Id 0xFDEA requires an additional
header parsing to extract new Message Identifier and new User Data from
WDP SMS User Data.

Test: MT MMS in China Telecom N/W and atest CdmaSmsTest

Change-Id: I8c0edd53c0da7c5b54fe6aa5a05f5577676383d8
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-08-28 14:13:46 +09:00
Treehugger Robot
c53985fc51 Merge "Fix spacing in NetworkStackClient" 2019-08-28 04:08:18 +00:00
Remi NGUYEN VAN
341c0f026a Fix spacing in NetworkStackClient
This makes the file match other branches, which should eliminate merge
conflicts.

Test: m
Merged-In: I673581b0067b9a3f72dd68a3ab622c18183ebd2e
Change-Id: Ida685159cb4afd6eceac6941e7126886518c8570
2019-08-28 10:59:34 +09:00
Remi NGUYEN VAN
f9354793f9 Run callbacks on ConnectivityService thread
Run MultinetworkPolicyTracker and DataConnectionStats callbacks on the
ConnectivityService handler thread.

Previously the callbacks would be using the SystemServer foreground
thread (Looper.myLooper()), or the broadcast thread for the
MultinetworkPolicyTracker BroadcastReceiver. This is error-prone, can
cause threading issues and makes it difficult to test the components.

Test: atest FrameworksNetTests
Change-Id: I189213dd363004abed294659165bf5430d153bba
2019-08-28 10:10:04 +09:00
Treehugger Robot
46993bb4f5 Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl" 2019-08-28 00:07:25 +00:00
Treehugger Robot
ca31913b92 Merge "Update droiddoc with combined generation of Java and Kotlin docs" 2019-08-27 21:48:58 +00:00
Pengquan Meng
9bc9b80912 Merge "Support WAC decoding in UMTS format" 2019-08-27 20:16:54 +00:00
Treehugger Robot
78658058dc Merge "Fix NPE" 2019-08-27 20:14:20 +00:00
Roshan Pius
c046f9f039 Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." 2019-08-27 17:06:55 +00:00
Treehugger Robot
24ae670b4e Merge "Fix backward compatibility when there's no secureElementName" 2019-08-27 16:30:15 +00:00
markchien
560c3ac1dc Passing caller package name to setBluetoothTethering
This is necessary to examine caller's permission. If caller's uid is not
same as passing package name, SecurityException would be throwed.
This change also clear the identity before calling
BluetoothPan#setBluetoothTethering() in Tethering#setBluetoothTethering.
This is fine because caller already pass permission check before in
ConnectivityService. See the flow below:
ConnectivityManager#startTethering -> ConnectivityService#startTethering
-> Tethering#startTethering -> Tethering#setBluetoothTethering
-> BluetoothPan#setBluetoothTethering

Bug: 134649258
Test: -build, flash, boot
      -atest FrameworkNetTests
      -manual test with bluetooth OFF/ON

Change-Id: I2140398ad3bbc8076f729c843f0515c654553aaf
2019-08-27 23:26:20 +08:00
Chalard Jean
21cfbfb35b Merge "Opportunistic cleanup" 2019-08-27 12:20:30 +00:00
Lorenzo Colitti
d889cb5098 Merge changes I69cdbb16,I6975e0b7
* changes:
  notify netd about uid internet permission changes when package replaced
  Backport PackageListObserver#onPackageChanged.
2019-08-27 10:17:42 +00:00
Chalard Jean
a9276c3cce Opportunistic cleanup
Remove a write-only local, a function that's never called, make
a public function private and avoid repeated useless creation
of string builders

Bug: None
Test: None needed
Change-Id: Id260613bc71f2cc04339a706ec5aa76032062a97
2019-08-27 09:48:49 +00:00
Taesu Lee
dc77d5a9ac Fix invalid padding bits for 7-bit ASCII encoding
Calculate correct padding bits for 7-bit ASCII encoding so that
unnecessary byte 0x00 is not appended in the User Data subparameter.
See the below issue case.

After encodeUserDataPayload(UserData;5 ASCII chars) in encodeUserData(),
UserData.numFields = 5 and UserData.payload = 5 septets and 5 bits
padding. Nevertheless if UserData.paddingBits = 0 still, paddingBits in
encodeUserData() will be 3. As a result, unnecessary one byte(5 + 3 bits)
padding is appended.

Test: Manual

Change-Id: I1cd19d5c491d8eed3b41bf5cb101fc77cb6090ab
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-08-27 17:28:41 +09:00
Tiem Song
730c19b99d Update droiddoc with combined generation of Java and Kotlin docs
Due to ownership change, this CL is a combination of the two CLs:

1) 1102398: Added droiddoc module to combined dokka, doclava and add
switcher.

Added ds-docs-switched that merges outputs of dokka, doclava, and
applies switcher4 to them.

Bug: 128540915
Test: m -j ds-docs-switched

===

2) 1098541: Combined target for dokka and doclava

Created a droiddoc module that creates reference docs using Kotlin.
Renamed droiddoc modules that only create one language ref-docs, and
created a genrule that merges them together.

Bug: 72394196
Bug: 138396395
Test: m -j ds-docs-kt
Test: m -j ds-docs-java
Test: m -j ds-docs

===

Change-Id: If9bed782feae84e986395a9ea6401025a51bc316
2019-08-26 22:44:49 -07:00
Treehugger Robot
660898768f Merge "Remove duplicated sources that go into hiddenapi-mappins" 2019-08-27 03:16:46 +00:00
Jiyong Park
5ca8fe3cfd Use framework_native_aidl for AIDL files in frameworks/native/aidl
The AIDL files under frameworks/native/aidl have been referenced via
their absolute paths. This required any module that has an AIDL file
depending on the AIDL types in the frameworks directory to explicitly
set the include path.

Fixing the problem by abstracting the AIDL files using filegroup where
the path property is set to the base directory for the files. The base
directory is used as include paths when the filegroup is added to srcs.

Bug: 135922046
Test: m
Test: m on sdk_phone_arm7
Merged-In: I8acb39522541f1e06d1a4b69b7a53b328c202eff
(cherry picked from commit 82f94056ce)
Change-Id: I8acb39522541f1e06d1a4b69b7a53b328c202eff
2019-08-27 02:20:39 +00:00
Jiyong Park
7563aabeb3 Remove duplicated sources that go into hiddenapi-mappins
framework-srcs are already coming from metalava-api-stubs-default (via
framework-minus-apex). We don't need to give framework-srcs again.

Test: choosecombo into sdk_phone_arm7
Test: m
out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/api-versions.xml
out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/dex-mapping.txt
out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/hiddenapi-mappings-stubs.srcjar
out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/hiddenapi-mappings_annotations.zip
is successful

Exempt-From-Owner-Approval: Approved internally
Merged-In: I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2
(cherry picked from commit 68020f8f63)
Change-Id: I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2
2019-08-27 10:46:42 +09:00
Treehugger Robot
8b4c9376c9 Merge "Implement sysprop_library API stability check" 2019-08-27 00:44:34 +00:00
Pengquan Meng
8853ce5e51 Merge "Supported multiple cell broadcast receivers" 2019-08-27 00:43:35 +00:00
Jiyong Park
d047e52296 Merge "Use filegroup to simplify Android.bp for frameworks and its friends" 2019-08-27 00:30:06 +00:00
Jack Yu
c56c207127 Supported multiple cell broadcast receivers
Bug: 122821947
Test: Manual
Merged-In: I293fed4aafbac6c176d3635f9437c2fba5b05efd
Change-Id: I293fed4aafbac6c176d3635f9437c2fba5b05efd
(cherry picked from commit fade231c92)
2019-08-26 15:34:01 -07:00
Pengquan Meng
c3427c01b3 Support WAC decoding in UMTS format
This add a decoder for WAC information. WAC is appended to the UMTS
cell broadcast message. The encoding is defined in ATIS-0700041.

Bug: 123096618
Test: build & manual test
Merged-In: I73dc22c27c2cfd47000ae65448fbc857ed9aa42f
Change-Id: I73dc22c27c2cfd47000ae65448fbc857ed9aa42f
(cherry picked from commit 14df7e3845369e7254e6aae13160c7e1caa1d28a)
(cherry picked from commit 1f64582bdf)
2019-08-26 16:24:14 +00:00
Jiyong Park
d6be579720 Use filegroup to simplify Android.bp for frameworks and its friends
Java and AIDL source files under frameworks/base are now modularized
using filegroup. Each filegroup has 'path' property set to the base
directory of the ssource files. This allows us to not rely on
aidl.[local_]include_dirs and srcs_lib_whitelist_dirs to get the base
directories.

Bug: 70046217
Test: m
Exempt-From-Owner-Approval: Approved internally
Merged-In: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
(cherry picked from commit b360931bf0)
Change-Id: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
2019-08-26 08:09:49 +00:00