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

Commit 9b7f1ba8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Profcollect: Allow manually triggering profile upload" am: fef90076 am: 4d2cb4c4 

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



Change-Id: I73a4afa1cb0555926ce7fef29f6a8c712f22c494
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c11438d 4d2cb4c4

services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java

+20 −3
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ import android.app.job.JobInfo; 
import android.app.job.JobParameters;

import android.app.job.JobScheduler;

import android.app.job.JobService;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.os.Handler;

import android.os.IBinder.DeathRecipient;

import android.os.Looper;
@@ -53,7 +55,8 @@ public final class ProfcollectForwardingService extends SystemService { 
    public static final String LOG_TAG = "ProfcollectForwardingService";



    private static final boolean DEBUG = Log.isLoggable(LOG_TAG, Log.DEBUG);



    private static final String INTENT_UPLOAD_PROFILES =

            "com.android.server.profcollect.UPLOAD_PROFILES";

    private static final long BG_PROCESS_PERIOD = TimeUnit.HOURS.toMillis(4); // every 4 hours.



    private IProfCollectd mIProfcollect;
@@ -66,6 +69,16 @@ public final class ProfcollectForwardingService extends SystemService { 
        }

    };



    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (intent.getAction() == INTENT_UPLOAD_PROFILES) {

                Log.d(LOG_TAG, "Received broadcast to pack and upload reports");

                packAndUploadReport();

            }

        }

    };



    public ProfcollectForwardingService(Context context) {

        super(context);
@@ -73,6 +86,10 @@ public final class ProfcollectForwardingService extends SystemService { 
            throw new AssertionError("only one service instance allowed");

        }

        sSelfService = this;



        final IntentFilter filter = new IntentFilter();

        filter.addAction(INTENT_UPLOAD_PROFILES);

        context.registerReceiver(mBroadcastReceiver, filter);

    }



    /**
@@ -296,7 +313,7 @@ public final class ProfcollectForwardingService extends SystemService { 
                }



                if (status == UpdateEngine.UpdateStatusConstants.UPDATED_NEED_REBOOT) {

                    packProfileReport();

                    packAndUploadReport();

                }

            }
@@ -307,7 +324,7 @@ public final class ProfcollectForwardingService extends SystemService { 
        });

    }



    private void packProfileReport() {

    private void packAndUploadReport() {

        if (mIProfcollect == null) {

            return;

        }