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

Commit 5c451c08 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev 

am: bb1fb395

Change-Id: Ic7b7520d4fa3cbfc79be49ded8a4ffd133d2b037
parents ac77f466 bb1fb395

core/java/android/app/ActivityManagerInternal.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.IIntentSender;

import android.content.IIntentSender;

import android.content.res.Configuration;

import android.os.IBinder;

import android.os.IBinder;

import android.service.voice.IVoiceInteractionSession;

import android.service.voice.IVoiceInteractionSession;
@@ -151,4 +152,13 @@ public abstract class ActivityManagerInternal { 
     *  such as Power Save mode.

     *  such as Power Save mode.

     */

     */

    public abstract void setPendingIntentWhitelistDuration(IIntentSender target, long duration);

    public abstract void setPendingIntentWhitelistDuration(IIntentSender target, long duration);



    /**

     * Updates and persists the {@link Configuration} for a given user.

     *

     * @param values the configuration to update

     * @param userId the user to update the configuration for

     */

    public abstract void updatePersistentConfigurationForUser(@NonNull Configuration values,

            int userId);

}
 
}

services/core/java/com/android/server/am/RetailDemoModeServiceInternal.java→core/java/android/app/RetailDemoModeServiceInternal.java

+9 −1
Original line number Original line Diff line number Diff line
@@ -14,8 +14,16 @@ 
 * limitations under the License

 * limitations under the License

 */

 */





package com.android.server.am;

package android.app;





/**

 * Retail Demo Mode Service interface to be used locally inside system server

 *

 * @hide Only for use inside system server

 */

public interface RetailDemoModeServiceInternal {

public interface RetailDemoModeServiceInternal {

    /**

     * Used to notify RetailDemoModeService of any user activity.

     */

    public void onUserActivity();

    public void onUserActivity();

}
 
}
 
 No newline at end of file

services/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ services := \ 
    net \

    net \

    print \

    print \

    restrictions \

    restrictions \

    retaildemo \

    usage \

    usage \

    usb \

    usb \

    voiceinteraction

    voiceinteraction

services/core/java/com/android/server/am/ActivityManagerService.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,7 @@ import org.xmlpull.v1.XmlPullParserException; 
import org.xmlpull.v1.XmlSerializer;

import org.xmlpull.v1.XmlSerializer;

















import android.Manifest;







import android.Manifest;














import android.annotation.NonNull;











import android.annotation.UserIdInt;







import android.annotation.UserIdInt;











import android.app.Activity;







import android.app.Activity;











import android.app.ActivityManager;







import android.app.ActivityManager;










@@ -21656,6 +21657,16 @@ public final class ActivityManagerService extends ActivityManagerNative









            }







            }











            ((PendingIntentRecord) target).setWhitelistDuration(duration);







            ((PendingIntentRecord) target).setWhitelistDuration(duration);











        }







        }



























        @Override














        public void updatePersistentConfigurationForUser(@NonNull Configuration values,














                int userId) {














            Preconditions.checkNotNull(values, "Configuration must not be null");














            Preconditions.checkArgumentNonnegative(userId, "userId " + userId + " not supported");














            synchronized (ActivityManagerService.this) {














                updateConfigurationLocked(values, null, false, true, userId);














            }














        }











    }







    }



























    private final class SleepTokenImpl extends SleepToken {







    private final class SleepTokenImpl extends SleepToken {

























services/core/java/com/android/server/power/Notifier.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -18,12 +18,12 @@ package com.android.server.power;





























import android.app.ActivityManagerInternal;







import android.app.ActivityManagerInternal;











import android.app.AppOpsManager;







import android.app.AppOpsManager;














import android.app.RetailDemoModeServiceInternal;































import com.android.internal.app.IAppOpsService;







import com.android.internal.app.IAppOpsService;











import com.android.internal.app.IBatteryStats;







import com.android.internal.app.IBatteryStats;











import com.android.server.EventLogTags;







import com.android.server.EventLogTags;











import com.android.server.LocalServices;







import com.android.server.LocalServices;











import com.android.server.am.RetailDemoModeServiceInternal;


































import android.app.ActivityManagerNative;







import android.app.ActivityManagerNative;











import android.content.BroadcastReceiver;







import android.content.BroadcastReceiver;