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

Commit df46bbba authored by Shinru Han's avatar Shinru Han Committed by Automerger Merge Worker
Browse files

Merge "Refine PSDS periodic download" into tm-dev am: 127afbda 

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



Change-Id: I4e0972a2cb6913173c756e25892e0347baef4a71
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a58f1649 127afbda

services/core/java/com/android/server/location/gnss/GnssLocationProvider.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -156,9 +156,6 @@ public class GnssLocationProvider extends AbstractLocationProvider implements 
    private static final int AGPS_SUPL_MODE_MSA = 0x02;

    private static final int AGPS_SUPL_MODE_MSA = 0x02;

    private static final int AGPS_SUPL_MODE_MSB = 0x01;

    private static final int AGPS_SUPL_MODE_MSB = 0x01;





    // PSDS stands for Predicted Satellite Data Service

    private static final int DOWNLOAD_PSDS_DATA = 6;



    // TCP/IP constants.

    // TCP/IP constants.

    // Valid TCP/UDP port range is (0, 65535].

    // Valid TCP/UDP port range is (0, 65535].

    private static final int TCP_MIN_PORT = 0;

    private static final int TCP_MIN_PORT = 0;
@@ -286,6 +283,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements 




    // true if PSDS is supported

    // true if PSDS is supported

    private boolean mSupportsPsds;

    private boolean mSupportsPsds;

    private final Object mPsdsPeriodicDownloadToken = new Object();

    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private final PowerManager.WakeLock mDownloadPsdsWakeLock;

    private final PowerManager.WakeLock mDownloadPsdsWakeLock;

    @GuardedBy("mLock")

    @GuardedBy("mLock")
@@ -670,10 +668,12 @@ public class GnssLocationProvider extends AbstractLocationProvider implements 
                });

                });

                PackageManager pm = mContext.getPackageManager();

                PackageManager pm = mContext.getPackageManager();

                if (pm != null && pm.hasSystemFeature(FEATURE_WATCH)

                if (pm != null && pm.hasSystemFeature(FEATURE_WATCH)

                        && psdsType == GnssPsdsDownloader.LONG_TERM_PSDS_SERVER_INDEX

                        && mGnssConfiguration.isPsdsPeriodicDownloadEnabled()) {

                        && mGnssConfiguration.isPsdsPeriodicDownloadEnabled()) {

                    if (DEBUG) Log.d(TAG, "scheduling next Psds download");

                    if (DEBUG) Log.d(TAG, "scheduling next long term Psds download");

                    mHandler.removeMessages(DOWNLOAD_PSDS_DATA);

                    mHandler.removeCallbacksAndMessages(mPsdsPeriodicDownloadToken);

                    mHandler.sendEmptyMessageDelayed(DOWNLOAD_PSDS_DATA,

                    mHandler.postDelayed(() -> handleDownloadPsdsData(psdsType),

                            mPsdsPeriodicDownloadToken,

                            GnssPsdsDownloader.PSDS_INTERVAL);

                            GnssPsdsDownloader.PSDS_INTERVAL);

                }

                }

            } else {

            } else {