Commit Graph

567306 Commits

Author SHA1 Message Date
Treehugger Robot
5d08573baa Merge "Check for invalid device attestation parameters" 2021-06-09 17:16:22 +00:00
Pedro Loureiro
6aa385ccdb Merge "Run bpfmt on api/Android.bp" 2021-06-09 13:41:25 +00:00
Pedro Loureiro
4f09b85b38 Run bpfmt on api/Android.bp
Test: m nothing
Change-Id: I4c7b49e6b5f9b3bec2aba305f8a6eb5e1d0561de
2021-06-09 10:59:32 +00:00
Allen Su
1c0577193b Merge "[RCS]Add OMA cpm filetransfer feature tag" 2021-06-09 02:18:58 +00:00
Treehugger Robot
cc0a3a9bef Merge changes from topic "process_madvise_aosp_cherrypick"
* changes:
  cleanups and fixes for process_madvise compaction
  Avoid unnecessary smaps logic during app compaction
  CachedAppOptimizer: fix fd leak.
  Fix function return type
  Migrate to use process_madvise syscall instead of procfs interface for memory compaction
2021-06-08 21:45:52 +00:00
Treehugger Robot
135446e812 Merge "Parse dalvik.vm.ps-min-save-period-ms property" 2021-06-08 20:58:45 +00:00
Sarah Chin
bcb868bd4d Merge "Create config KEY_ADDITIONAL_NR_ADVANCED_BAND_INT_ARRAY" 2021-06-08 20:47:10 +00:00
Sarah Chin
e431ce4aef Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" 2021-06-08 20:47:10 +00:00
Edgar Arriaga
a251df62b7 cleanups and fixes for process_madvise compaction
some fix suggestions that came up on ag/13665789 and some other cleanups
1. Use unique_fd instead of raw int to keep pidfd
2. Return the total compacted bytes on success for compactProcess
3. Fix for error potentially returning a random value
4. Fix truncation that could happen when calling madvise
5. Fail fast after encountering an error instead of silently
advancing to other VMAs when compacting.

Bug: 162993824
Test: Manual
Signed-off-by: Edgar Arriaga <edgararriaga@google.com>
Change-Id: Ide644f66cf0ebdea570dcb365d6a2400ffb18f4e
2021-06-08 13:27:06 -07:00
Edgar Arriaga
3536bf7b55 Avoid unnecessary smaps logic during app compaction
ForEachVma can extract data from both maps and smaps files,
however the smaps logic is not used during app compaction.
Replace its usage with ForEachVmaFromMaps which reads only
maps file and skips any smaps logic.
This results in ~22% CPU usage reduction.

Test: Manual
Bug: 181174877

Signed-off-by: Edgar Arriaga <edgararriaga@google.com>
Change-Id: I165f211c2084676bc7872d190ffad14141f56ea8
Merged-In: I165f211c2084676bc7872d190ffad14141f56ea8
2021-06-08 13:27:06 -07:00
Josh Gao
9a24046259 CachedAppOptimizer: fix fd leak.
errno isn't modified when a syscall returns successfully: this would
leak if errno was already non-zero before entering this function.

Bug: 172518739
Test: none
Change-Id: I38050863ceca226a9c2d143c85e0713c6a6fe511
Merged-In: I38050863ceca226a9c2d143c85e0713c6a6fe511
2021-06-08 13:26:24 -07:00
Sarah Chin
47685a9798 Merge "Add URSP matching failures as permanent failures" 2021-06-08 19:47:45 +00:00
Seth Moore
d57dabcc94 Check for invalid device attestation parameters
Previous releases explicitly check for invalid inputs. These checks
were removed with the move to keystore2 -- add them back.

Remove old prepareAttestationArguments* methods, as they are no
longer referenced.

Bug: 188741672
Test: com.google.android.gts.security.DeviceIdAttestationHostTest
Change-Id: I4eeec8367ebdfad527395206ab9e89b409e02631
Merged-In: I4eeec8367ebdfad527395206ab9e89b409e02631
2021-06-08 12:40:38 -07:00
Sarah Chin
f9bf0a696b Merge "Add function to get APN types as ints from bitmask" 2021-06-08 18:51:06 +00:00
Sarah Chin
266ef52303 Add URSP matching failures as permanent failures
Prevent retry and continuous set up/fail loop.

Test: build
Fix: 185609488
Change-Id: I641ff0a9f6d96ba2bcc07cfebf54205d46e0e5ef
Merged-In: I641ff0a9f6d96ba2bcc07cfebf54205d46e0e5ef
2021-06-08 11:42:11 -07:00
Sarah Chin
0503e1c13c Merge "Add new data fail causes for ENTERPRISE failures" 2021-06-08 18:19:15 +00:00
SongFerngWang
c9788002a5 Create config KEY_ADDITIONAL_NR_ADVANCED_BAND_INT_ARRAY
A list of additional NR advanced band is used to determine which
particular band has high data rate capability. The data rate is
higher than the generic 5G data rate.

Bug: 183652287
Test: build pass
Change-Id: I45551902c7f1f4cfdc575b6a6c65351bce85d638
Merged-In: I45551902c7f1f4cfdc575b6a6c65351bce85d638
2021-06-08 10:16:44 -07:00
SongFerngWang
a1066d1a5d Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo
NetworkTypeController set OVERRIDE_NETWORK_TYPE_NR_ADVANCED when
device connect NR and frequency is mmWave.

Bug: 179443240
Bug: 179453836
Test: atest frameworks/opt/telephony/src/java/com/android/internal/telephony/NetworkTypeController.java
Change-Id: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0
Merged-In: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0
2021-06-08 10:03:01 -07:00
Remi NGUYEN VAN
1ebfd58606 Merge "Merge framework-connectivity impl and stub targets" 2021-06-08 09:15:15 +00:00
Treehugger Robot
c6c226327d Merge "Add ART members to AndroidRuntime ownership" 2021-06-08 05:06:08 +00:00
Greg Kaiser
a4ecb890df Fix function return type
Test: TreeHugger
Change-Id: I2336a0c2bf3f71cc0b0bc1ef491a1043e88f359e
Merged-In: I2336a0c2bf3f71cc0b0bc1ef491a1043e88f359e
2021-06-08 00:21:40 +00:00
Edgar Arriaga
c51efbe68f Migrate to use process_madvise syscall instead of procfs interface for memory compaction
Currently the system uses procfs and we are migrating to use a syscall
called process_madvise which makes the code upstreamable and will allow
for making compaction widely available for multiple android devices.

It also opens room for future developments that involve a finer grain
VMA compressions than the current procfs allows.

Test: Ran the system without crashes and verified am_compact was effectively showing compressed memory (free zram reduced) when compressing.

Bug: 162993824
Test: Manual, verified that zram was being increased over time after compactions happened

Change-Id: I9d9d895aee7fbc46a2f12f6ca080ab8457ea7222
Merged-In: I9d9d895aee7fbc46a2f12f6ca080ab8457ea7222
2021-06-08 00:21:17 +00:00
Sarah Chin
a3fce76dab Add function to get APN types as ints from bitmask
Bug: 181889657
Test: atest DataConnectionTest
Change-Id: I473b6bc3341bc3782b9c53eeca58c2ede18b6702
Merged-In: I473b6bc3341bc3782b9c53eeca58c2ede18b6702
2021-06-07 16:51:29 -07:00
Calin Juravle
5c4aa4f2f7 Add ART members to AndroidRuntime ownership
Test: m
Change-Id: Ice016370ab5b4a5ce99ca118eaace55426643422
2021-06-07 22:22:15 +00:00
Anton Hansson
9489b44d47 Merge "Make ApiLint's new_since arg the merged txt file" 2021-06-07 14:55:59 +00:00
Anton Hansson
c954550513 Make ApiLint's new_since arg the merged txt file
ApiLint tries to only lint "new" APIs, i.e. those introduced since the
last frozen API. Using android-non-updatable's last frozen txt does not
work well for this, as it is incomplete API surface on its own, so
metalava cannot see all APIs that were present in the previous API
(such as methods inherited from ART), and so makes the wrong decisions
for which APIs are new.

Bug: 171506470
Test: m checkapi
Change-Id: I00d25f2ae0ba8f0ee6fa8564d86642efd74e0d44
Merged-In: I00d25f2ae0ba8f0ee6fa8564d86642efd74e0d44
(cherry picked from commit 4f90aa5148)
2021-06-07 14:42:59 +01:00
Jeff Sharkey
feac43d47a Merge "Update OWNERS for AppSearch" 2021-06-07 13:11:45 +00:00
Remi NGUYEN VAN
839a761100 Merge "Build service-connectivity with system_server API" 2021-06-07 05:17:21 +00:00
Treehugger Robot
e2ddd9d277 Merge "Do not canonicalize overlay config test paths" 2021-06-04 17:04:49 +00:00
Nikita Iashchenko
71afce9340 Merge "Remove usage of Math.randomLongInternal" 2021-06-04 08:37:09 +00:00
Thiébaud Weksteen
2090502b46 Merge "Fix Javadoc typo" 2021-06-04 07:14:04 +00:00
Remi NGUYEN VAN
a2f8b41020 Merge "Add NDK API for getprocdns,setprocdns" 2021-06-04 07:01:11 +00:00
Sarah Chin
7576e161f1 Merge "Remove checks for system_process in TelephonyManager" 2021-06-04 02:11:17 +00:00
Sarah Chin
6428a56e09 Merge "DCT set up default before enterprise APN" 2021-06-04 02:10:29 +00:00
Sarah Chin
fe3320f5a3 Merge "setCdmaSubscription/RoamingMode returns when not CDMA" 2021-06-04 02:10:19 +00:00
Calin Juravle
a2ba369d20 Parse dalvik.vm.ps-min-save-period-ms property
Test: adb shell setprop dalvik.vm.ps-min-save-period-ms 300;
Bug: 185979271
Change-Id: I2f30675b335ca0b9b1f1d30144fcdfa4fc680b41
2021-06-03 18:20:38 -07:00
Sarah Chin
4a3db57ba5 Remove checks for system_process in TelephonyManager
Instead of throwing exceptions, return the default null/empty/void
behavior.

Test: atest TelephonyManagerTest
Fix: 175881713
Change-Id: Ia15c8183212bc67e74b45fc119b5ef9d4c295c94
Merged-In: Ia15c8183212bc67e74b45fc119b5ef9d4c295c94
2021-06-03 17:56:53 -07:00
Sarah Chin
bec5952311 Add new data fail causes for ENTERPRISE failures
Test: atest DataConnectionTest, DcTrackerTest
Bug: 183979790
Bug: 183739359
Change-Id: I71d30dd27430721f2d9c8b9e488d1e50e65992bb
Merged-In: I71d30dd27430721f2d9c8b9e488d1e50e65992bb
2021-06-03 17:25:59 -07:00
Sarah Chin
92b8e55acf DCT set up default before enterprise APN
Higher priority goes first in mPrioritySortedApnContexts, so change
default priority to be higher than enterprise.

Test: atest DcTrackerTest
Bug: 183738520
Change-Id: Ib2f9594933d00307276f4538714a5354d36baf09
Merged-In: Ib2f9594933d00307276f4538714a5354d36baf09
2021-06-03 17:15:29 -07:00
Sarah Chin
5fa39ffd17 setCdmaSubscription/RoamingMode returns when not CDMA
NoOp instead of return ISE when the device is not CDMA capable.

Test: atest TelephonyManagerTest
Fix: 175665470
Change-Id: I36d69f4bf337ef9c102327bfe87752c56847af87
Merged-In: I36d69f4bf337ef9c102327bfe87752c56847af87
2021-06-03 17:09:52 -07:00
Treehugger Robot
d6eba76780 Merge "Use finally block for Binder.restoreCallingIdentity" 2021-06-03 20:05:50 +00:00
Shuo Qian
6f61cdcc1d Merge "Add KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL for treating *67 and *82 as a temporary mode CLIR when dialing E911" 2021-06-03 19:46:20 +00:00
Treehugger Robot
4952525b1c Merge "Set dist_group: "android" for frameworks/base java_sdk_libraries" 2021-06-03 19:11:59 +00:00
Julia Reynolds
cfd9af452b Merge "unregister FileCleanupReceiver when disableHistory" 2021-06-03 17:08:56 +00:00
Colin Cross
5959ec0a5f Set dist_group: "android" for frameworks/base java_sdk_libraries
dist_group replaces owner and the default is going to change, set it
to the current default "android" for frameworks/base java_sdk_libraries.

Bug: 186723288
Test: m checkbuild
Change-Id: I1526853951bcffbe5c5aec6fbc6ba8e0dbea95ad
Merged-In: I1526853951bcffbe5c5aec6fbc6ba8e0dbea95ad
2021-06-03 16:42:11 +00:00
Shuo Qian
86db99b182 Add KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL for treating *67 and *82 as a temporary mode CLIR when dialing E911
Test: atest
Bug: 182126268
Change-Id: Iab56a59d7cb17e3e8131304fbc906e101bb87b42
Merged-In: Iab56a59d7cb17e3e8131304fbc906e101bb87b42
(cherry picked from commit d4dd13c2e3)
2021-06-03 16:41:35 +00:00
hongyang.dong
52853a2d47 unregister FileCleanupReceiver when disableHistory
FileCleanupReceiver was not unregister when switch NotificationHistory

Testing Steps:

1. Settings -> Apps and notifications -> Notifications -> Notification history
2. Repeat switch 1000 times and system crash.

Change-Id: I40493fe7726883a449e54888247c5bffcc1554e3
2021-06-03 14:21:51 +00:00
Thiébaud Weksteen
90c63acfa0 Fix Javadoc typo
HTML ol element is used to declare an ordered list, not a list item.

Change-Id: I1fac2f236ce40effb54fdead01c99729d4ef15b4
2021-06-03 10:31:15 +02:00
Remi NGUYEN VAN
37bc6b577c Merge "Add NDK API for getprocnetwork" 2021-06-03 08:07:23 +00:00
Treehugger Robot
df2c78d226 Merge "/widget/OWNERS: Change TextView to TextView*" 2021-06-03 01:12:12 +00:00