| commit | e977504e7aeb6beca522d8b3bfc82028755bc93f | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 02 06:26:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 02 06:26:20 2020 +0000 |
| tree | b7bdf0863fc8fec24fabb71c3c0b1efd5dfa0e65 | |
| parent | 1bfab8243c62fc9ff5fbad7b7b5b475dd8178d65 [diff] | |
| parent | 5d9fc9340b62f9ac545956e54ca2398f44e56595 [diff] |
Merge "Add an override for getUser in ContextWrapper" am: 5a049f5cf2 am: 5d9fc9340b Change-Id: I33223887a6807d2f3caa81df3ead1caa10a015ea
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 22b345f..877557f 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java
@@ -943,6 +943,12 @@ return mBase.getUserId(); } + /** @hide */ + @Override + public UserHandle getUser() { + return mBase.getUser(); + } + @Override public Context createConfigurationContext(Configuration overrideConfiguration) { return mBase.createConfigurationContext(overrideConfiguration);