Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
630,687 Commits 3 Branches 0 Tags
45abbc309d74767efdced006742fcbae2eefaf60
Commit Graph

630687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quang Luong
45abbc309d Merge "Update min_sdk_versions to match WifiTrackerLib" into sc-dev 2021-03-19 16:19:15 +00:00
TreeHugger Robot
6ed6e6e18e Merge "Fix InetAddressCompat exception handling" into sc-dev 2021-03-19 16:14:10 +00:00
Hangyu Kuang
088ba1636e Merge "transcoding: Address API council comments Part2" into sc-dev 2021-03-19 16:08:59 +00:00
Ricky Wai
5b7bdf95bc Merge "Revert "Change mounting storage data and obb to on by default"" into sc-dev 2021-03-19 16:03:54 +00:00
TreeHugger Robot
21ca6a91a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-19 15:49:48 +00:00
Evan Severson
36cd5ef49b Merge "Make the muteFromPrivacyToggle state transparent" into sc-dev 2021-03-19 15:46:21 +00:00
TreeHugger Robot
b61ef5342c Merge "Remove reference of getActiveLinkproperties" into sc-dev 2021-03-19 15:35:08 +00:00
Lorenzo Colitti
177d8e36f5 Merge "Copy NetworkNotificationManager resources to conectivity module." into sc-dev 2021-03-19 15:18:34 +00:00
TreeHugger Robot
6d9d999b50 Merge "Ensure dumpable tag is unique" into sc-dev 2021-03-19 15:18:31 +00:00
Lorenzo Colitti
fe3f33de19 Copy NetworkNotificationManager resources to conectivity module. 
The localized resources were automatically generated with:

===========
export OLDRES=core/res/res
export NEWRES=packages/Connectivity/service/ServiceConnectivityResources/res
export FILE=services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

for i in $OLDRES/values-*/strings.xml; do
    outfile=$NEWRES/${i#core/res/res/}
    outdir=$(dirname $outfile)

    if egrep -q "$regex" $i || egrep -q "$strarrayregex" $i; then
        mkdir -p $outdir

        cat << EOF > $outfile
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2021 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
EOF

        egrep $regex $i >> $outfile

        egrep -A $strarraylines "$strarrayregex" $i >> $outfile

        echo "</resources>" >> $outfile
    fi
done
===========

The text to the the base resources file was added manually from
the output of:

===========
egrep -B 2 $regex core/res/res/values/strings.xml  | grep -v -- ^--
egrep -B 2 -A 6 $strarrayregex core/res/res/values/strings.xml  | grep -v -- ^--
===========

The drawables were copied from the Wifi resources and from the
framework resources.

Test: m
Bug: 183097033
Change-Id: I99c0d28069dd1a13d452105b0a83a03a833232a2
 2021-03-20 00:16:17 +09:00
TreeHugger Robot
2737162d9e [automerger skipped] Merge "Keystore 2.0: Enable by default." into rvc-qpr-dev-plus-aosp am: 58710e9a15 -s ours 
am skip reason: skip tag Change-Id I13a3db8ca736cceb06e864457046ff9ca641322d with SHA-1 7aa8d2aae2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13913584

Change-Id: Ie2e51a6f5821bf72d482845d040c9d5a678b2b56
 2021-03-19 15:09:19 +00:00
SongFerng Wang
8a261dfbca [automerger skipped] Merge "Implementation of "Enable 2G" for Settings." am: 3ccc2738e2 am: 74de537b56 am: 2c9acf1094 -s ours 
am skip reason: skip tag Change-Id I81052549f8dde491697c35365320145fd24c3842 with SHA-1 8fa54b7c20 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641783

Change-Id: I4de0d4e0fc172dbe9fc45194783499e66fe46d15
 2021-03-19 15:08:03 +00:00
TreeHugger Robot
58710e9a15 Merge "Keystore 2.0: Enable by default." into rvc-qpr-dev-plus-aosp 2021-03-19 15:05:00 +00:00
Remi NGUYEN VAN
141b54e9c5 Fix InetAddressCompat exception handling 
Fix InetAddressCompat exception handling to throw the original exception
in case of InvocationTargetException, rather than wrapping in a generic
IllegalStateException.

Bug: 183198868
Test: Test device with and without connectivity
Change-Id: Idc4d678afe9f20f920d7061790af4203ab75be26
 2021-03-19 14:45:48 +00:00
Chalard Jean
7037802648 Merge "Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API" into sc-dev 2021-03-19 14:26:06 +00:00
SongFerng Wang
2c9acf1094 Merge "Implementation of "Enable 2G" for Settings." am: 3ccc2738e2 am: 74de537b56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641783

Change-Id: I43640a7ef47ca09c08d042b8d4ceb76b5c54c4eb
 2021-03-19 14:23:29 +00:00
Ricky Wai
6a47d1fe93 Revert "Change mounting storage data and obb to on by default" 
Revert submission 13469849-turn_on_iso-sc-dev

Reason for revert: Failing existing CTS b/182843583
Reverted Changes:
If819ee161:Change mounting storage data and obb to on by defa...
I46a095448:Change mounting storage data and obb to on by defa...

Change-Id: I7b33baebe150ab78551c7b4368320f056cdcbceb
 2021-03-19 14:21:46 +00:00
Lucas Lin
5ebb78adfb Merge "Remove the usage of hidden API and simplify the design" into sc-dev 2021-03-19 14:14:41 +00:00
Lucas Lin
b6223b178b Merge "Use public API Network#getNetId() to get netid" into sc-dev 2021-03-19 14:14:12 +00:00
Alex Buynytskyy
47714e9c23 Merge "Untangle listeners mess in IncrementalService" into sc-dev 2021-03-19 14:06:40 +00:00
Alex Buynytskyy
1509818c07 Merge "[incfs] Call the new isFullyLoaded api where possible" into sc-dev 2021-03-19 14:06:18 +00:00
Alex Buynytskyy
bb9c220903 Merge "[incfs] Fix the unsafe memory copy in IncrementalService" into sc-dev 2021-03-19 14:05:59 +00:00
junyulai
1bb3f75b05 Remove reference of getActiveLinkproperties 
For callers who access the hidden API, replaced with
public APIs.

Test: atest FrameworksNetTests
Bug: 182963397
Change-Id: Ic0e895c77cf3efb78ddc333c4f3b1016cebcfe17
 2021-03-19 21:59:45 +08:00
SongFerng Wang
74de537b56 Merge "Implementation of "Enable 2G" for Settings." am: 3ccc2738e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641783

Change-Id: Iece18c00a337bcadcb82c7239ea6575ad158048c
 2021-03-19 13:46:27 +00:00
Remi NGUYEN VAN
a499eef394 Merge "Move NetworkUtils JNI out of core/jni" into sc-dev 2021-03-19 13:42:54 +00:00
Nicolò Mazzucato
11bc52ed42 Merge "Always call onHandleAssist with AssistState containing at least activity id" into sc-dev 2021-03-19 13:34:18 +00:00
Beverly
1faa1baaa6 Ensure dumpable tag is unique 
By appending the current instance to its tag

Test: manual
Fixes: 183137150
Change-Id: I4734a18ea3d5f79c32653e70ebf9216c36594d9d
 2021-03-19 09:23:16 -04:00
Fabian Kozynski
84db07434a Merge "Assume wifi is connected if the icon is says so" into sc-dev 2021-03-19 13:14:46 +00:00
SongFerng Wang
3ccc2738e2 Merge "Implementation of "Enable 2G" for Settings." 2021-03-19 13:09:55 +00:00
Treehugger Robot
7ff0c7c352 Merge "Reset min_sdk_version of libmedia_jni" am: 0afaa9d9f6 am: 80ff97c8a5 am: 3d01b54d52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640145

Change-Id: I793ab1a84edc7f71434378f364960332761c33c9
 2021-03-19 13:09:24 +00:00
Chiachang Wang
c87855908f Merge "Add startCaptivePortalApp to system API" am: b53aeb4682 am: 1cd0e8f0fc am: 8020cb4517 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639899

Change-Id: Ia3be29892f62b82d23a165bc8334a083c674aefb
 2021-03-19 13:09:03 +00:00
Automerger Merge Worker
69d845519a Merge changes from topic "am-68be966eb69c42be9da64afcf97a48dc" into sc-dev 
* changes:
  [automerger skipped] Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed am: 79d2054b14 am: 4247c39cd5 am: f62fcf6e41 -s ours
  [automerger skipped] Remove reference of NetworkAgent#unwanted() am: 705370a231 am: 95d55e71af am: c7fafa186b -s ours
  [automerger skipped] Remove references of NetworkAgentConfig constructor am: a1a61cde9c am: ddc41d43c7 am: d4a41a8a38 -s ours
  [automerger skipped] Remove reference of @ValidationStatus annotation am: 557797e32c am: 1dd354e2d7 am: cedeb55983 -s ours
 2021-03-19 13:08:35 +00:00
TreeHugger Robot
7b674d0517 Merge "Replace hidden API usages of NetworkCapabilities" into sc-dev 2021-03-19 13:08:28 +00:00
Treehugger Robot
5decec715d [automerger skipped] Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed am: 79d2054b14 am: 4247c39cd5 am: f62fcf6e41 -s ours 
am skip reason: skip tag Change-Id I18d2cceafad633a95bd909b7f693d45e8a861bc9 with SHA-1 9bb8218d15 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645296

Change-Id: I1cd3c5d0af36d202e36a7778c8fafb76897938c0
 2021-03-19 13:08:23 +00:00
junyulai
5a3ce24d25 [automerger skipped] Remove reference of NetworkAgent#unwanted() am: 705370a231 am: 95d55e71af am: c7fafa186b -s ours 
am skip reason: skip tag Change-Id I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2 with SHA-1 29eeaf410f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645295

Change-Id: I9ddf32d93b7390349a7813bf18a63fabb4d1a770
 2021-03-19 13:08:13 +00:00
junyulai
3840894508 [automerger skipped] Remove references of NetworkAgentConfig constructor am: a1a61cde9c am: ddc41d43c7 am: d4a41a8a38 -s ours 
am skip reason: skip tag Change-Id Ib8ea2a17276cfd000e7003fc86d15458e1f82b39 with SHA-1 549dfb9536 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645294

Change-Id: I21b98408d8278f25b9f770abdac7db4dcd117417
 2021-03-19 13:08:05 +00:00
junyulai
da1e28d09a [automerger skipped] Remove reference of @ValidationStatus annotation am: 557797e32c am: 1dd354e2d7 am: cedeb55983 -s ours 
am skip reason: skip tag Change-Id Iaba678ed3af92f87cfeccaacf1cc5723c8e5dcae with SHA-1 4f33258550 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645293

Change-Id: I08c10acea086320e299bcd5e074c9e78ef967d48
 2021-03-19 13:07:57 +00:00
Lucas Lin
147b184822 Merge "Remove unused import IConnectivityManager" into sc-dev 2021-03-19 12:53:04 +00:00
Mariia Sandrikova
d299c8c035 Merge "Don't show letterbox UI for apps that show wallpaper." into sc-dev 2021-03-19 12:51:07 +00:00
Treehugger Robot
3d01b54d52 Merge "Reset min_sdk_version of libmedia_jni" am: 0afaa9d9f6 am: 80ff97c8a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640145

Change-Id: I9e37f8f478b3e08c1ca68296ce733035fd0f0009
 2021-03-19 12:26:54 +00:00
Chiachang Wang
8020cb4517 Merge "Add startCaptivePortalApp to system API" am: b53aeb4682 am: 1cd0e8f0fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639899

Change-Id: I7e82a2a8efb13b960b8f79b9646fcac07c7ac569
 2021-03-19 12:26:42 +00:00
Treehugger Robot
f62fcf6e41 Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed am: 79d2054b14 am: 4247c39cd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645296

Change-Id: Id6b9fcc31777ad33abfaee2a11e07df92766cd32
 2021-03-19 12:26:27 +00:00
junyulai
c7fafa186b Remove reference of NetworkAgent#unwanted() am: 705370a231 am: 95d55e71af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645295

Change-Id: I4d8ad54e60a9e860607021755a1a3e0da5535c99
 2021-03-19 12:26:23 +00:00
junyulai
d4a41a8a38 Remove references of NetworkAgentConfig constructor am: a1a61cde9c am: ddc41d43c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645294

Change-Id: I0f0e1c9631afdcd8fbf611bc67091ca015ee9acf
 2021-03-19 12:26:19 +00:00
junyulai
cedeb55983 Remove reference of @ValidationStatus annotation am: 557797e32c am: 1dd354e2d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645293

Change-Id: Id46ca15d6b9f2cfd06575ce204c4de8dca39f3ea
 2021-03-19 12:26:15 +00:00
Flavio Fiszman
b4a4b46b7b Merge "Remove People Tile flag and clean up" into sc-dev 2021-03-19 12:22:03 +00:00
Treehugger Robot
80ff97c8a5 Merge "Reset min_sdk_version of libmedia_jni" am: 0afaa9d9f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640145

Change-Id: Ifaf9cf35a6a675b1d13e958d4476c8d07eb35029
 2021-03-19 12:12:41 +00:00
TreeHugger Robot
438fa8a3ee Merge "Fix crash in BrightnessTracker" into sc-dev 2021-03-19 12:09:46 +00:00
Chiachang Wang
1cd0e8f0fc Merge "Add startCaptivePortalApp to system API" am: b53aeb4682 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639899

Change-Id: I2efbc3276ccce8df4d77c06dc2d50bd4d2bed9b5
 2021-03-19 11:59:16 +00:00
Treehugger Robot
4247c39cd5 Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed am: 79d2054b14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645296

Change-Id: I065412121b0282de2d3f09a72b13249d07359557
 2021-03-19 11:56:21 +00:00