Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad24dd3 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge "Remove lowpan internal API" am: 649a2084 

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



Change-Id: Ic52a2b85fa3cf8310bf91e19d883986c4d8e1155
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6111dff 649a2084

Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ filegroup { 
        ":framework-keystore-sources",

        ":framework-identity-sources",

        ":framework-location-sources",

        ":framework-lowpan-sources",

        ":framework-mca-effect-sources",

        ":framework-mca-filterfw-sources",

        ":framework-mca-filterpacks-sources",
@@ -167,7 +166,6 @@ java_defaults { 
            "identity/java",

            "keystore/java",

            "location/java",

            "lowpan/java",

            "media/java",

            "media/mca/effect/java",

            "media/mca/filterfw/java",

core/java/android/app/SystemServiceRegistry.java

+0 −11
Original line number Diff line number Diff line
@@ -147,8 +147,6 @@ import android.net.NetworkWatchlistManager; 
import android.net.PacProxyManager;

import android.net.TetheringManager;

import android.net.VpnManager;

import android.net.lowpan.ILowpanManager;

import android.net.lowpan.LowpanManager;

import android.net.vcn.IVcnManagementService;

import android.net.vcn.VcnManager;

import android.net.wifi.WifiFrameworkInitializer;
@@ -768,15 +766,6 @@ public final class SystemServiceRegistry { 
                        ctx.mMainThread.getHandler());

            }});



        registerService(Context.LOWPAN_SERVICE, LowpanManager.class,

                new CachedServiceFetcher<LowpanManager>() {

            @Override

            public LowpanManager createService(ContextImpl ctx) throws ServiceNotFoundException {

                IBinder b = ServiceManager.getServiceOrThrow(Context.LOWPAN_SERVICE);

                ILowpanManager service = ILowpanManager.Stub.asInterface(b);

                return new LowpanManager(ctx.getOuterContext(), service);

            }});



        registerService(Context.WIFI_NL80211_SERVICE, WifiNl80211Manager.class,

                new CachedServiceFetcher<WifiNl80211Manager>() {

                    @Override

lowpan/java/Android.bp

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

    name: "framework-lowpan-sources",

    srcs: [

        "**/*.java",

        "**/*.aidl",

    ],

    visibility: ["//frameworks/base"],

}

lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.

 */



package android.net.lowpan;



/** {@hide} */

interface ILowpanEnergyScanCallback {

    oneway void onEnergyScanResult(int channel, int rssi);

    oneway void onEnergyScanFinished();

}

lowpan/java/android/net/lowpan/ILowpanInterface.aidl

deleted100644 → 0
+0 −155
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.

 */



package android.net.lowpan;



import android.net.IpPrefix;

import android.net.lowpan.ILowpanEnergyScanCallback;

import android.net.lowpan.ILowpanInterfaceListener;

import android.net.lowpan.ILowpanNetScanCallback;

import android.net.lowpan.LowpanBeaconInfo;

import android.net.lowpan.LowpanChannelInfo;

import android.net.lowpan.LowpanCredential;

import android.net.lowpan.LowpanIdentity;

import android.net.lowpan.LowpanProvision;



/** {@hide} */

interface ILowpanInterface {



    // These are here for the sake of C++ interface implementations.



    const String PERM_ACCESS_LOWPAN_STATE    = "android.permission.ACCESS_LOWPAN_STATE";

    const String PERM_CHANGE_LOWPAN_STATE    = "android.permission.CHANGE_LOWPAN_STATE";

    const String PERM_READ_LOWPAN_CREDENTIAL = "android.permission.READ_LOWPAN_CREDENTIAL";



    /**

     * Channel mask key.

     * Used for setting a channel mask when starting a scan.

     * Type: int[]

     * */

    const String KEY_CHANNEL_MASK       = "android.net.lowpan.property.CHANNEL_MASK";



    /**

     * Max Transmit Power Key.

     * Used for setting the maximum transmit power when starting a network scan.

     * Type: Integer

     * */

    const String KEY_MAX_TX_POWER       = "android.net.lowpan.property.MAX_TX_POWER";



    // Interface States



    const String STATE_OFFLINE = "offline";

    const String STATE_COMMISSIONING = "commissioning";

    const String STATE_ATTACHING = "attaching";

    const String STATE_ATTACHED = "attached";

    const String STATE_FAULT = "fault";



    // Device Roles



    const String ROLE_END_DEVICE = "end-device";

    const String ROLE_ROUTER = "router";

    const String ROLE_SLEEPY_END_DEVICE = "sleepy-end-device";

    const String ROLE_SLEEPY_ROUTER = "sleepy-router";

    const String ROLE_LEADER = "leader";

    const String ROLE_COORDINATOR = "coordinator";

    const String ROLE_DETACHED = "detached";



    const String NETWORK_TYPE_UNKNOWN = "unknown";



    /**

     * Network type for Thread 1.x networks.

     *

     * @see android.net.lowpan.LowpanIdentity#getType

     * @see #getLowpanIdentity

     */

    const String NETWORK_TYPE_THREAD_V1 = "org.threadgroup.thread.v1";



    // Service-Specific Error Code Constants



    const int ERROR_UNSPECIFIED = 1;

    const int ERROR_INVALID_ARGUMENT = 2;

    const int ERROR_DISABLED = 3;

    const int ERROR_WRONG_STATE = 4;

    const int ERROR_TIMEOUT = 5;

    const int ERROR_IO_FAILURE = 6;

    const int ERROR_NCP_PROBLEM = 7;

    const int ERROR_BUSY = 8;

    const int ERROR_ALREADY = 9;

    const int ERROR_CANCELED = 10;

    const int ERROR_FEATURE_NOT_SUPPORTED = 11;

    const int ERROR_JOIN_FAILED_UNKNOWN = 12;

    const int ERROR_JOIN_FAILED_AT_SCAN = 13;

    const int ERROR_JOIN_FAILED_AT_AUTH = 14;

    const int ERROR_FORM_FAILED_AT_SCAN = 15;



    // Methods



    @utf8InCpp String getName();



    @utf8InCpp String getNcpVersion();

    @utf8InCpp String getDriverVersion();

    LowpanChannelInfo[] getSupportedChannels();

    @utf8InCpp String[] getSupportedNetworkTypes();

    byte[] getMacAddress();



    boolean isEnabled();

    void setEnabled(boolean enabled);



    boolean isUp();

    boolean isCommissioned();

    boolean isConnected();

    @utf8InCpp String getState();



    @utf8InCpp String getRole();

    @utf8InCpp String getPartitionId();

    byte[] getExtendedAddress();



    LowpanIdentity getLowpanIdentity();

    LowpanCredential getLowpanCredential();



    @utf8InCpp String[] getLinkAddresses();

    IpPrefix[] getLinkNetworks();



    void join(in LowpanProvision provision);

    void form(in LowpanProvision provision);

    void attach(in LowpanProvision provision);

    void leave();

    void reset();



    void startCommissioningSession(in LowpanBeaconInfo beaconInfo);

    void closeCommissioningSession();

    oneway void sendToCommissioner(in byte[] packet);



    void beginLowPower();

    oneway void pollForData();



    oneway void onHostWake();



    void addListener(ILowpanInterfaceListener listener);

    oneway void removeListener(ILowpanInterfaceListener listener);



    void startNetScan(in Map properties, ILowpanNetScanCallback listener);

    oneway void stopNetScan();



    void startEnergyScan(in Map properties, ILowpanEnergyScanCallback listener);

    oneway void stopEnergyScan();



    void addOnMeshPrefix(in IpPrefix prefix, int flags);

    oneway void removeOnMeshPrefix(in IpPrefix prefix);



    void addExternalRoute(in IpPrefix prefix, int flags);

    oneway void removeExternalRoute(in IpPrefix prefix);

}