[M56 fork] Fix DeviceDisplayInfo UnsatisfiedLinkError

ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.ui.display;
 
 import android.annotation.SuppressLint;
 import android.content.ComponentCallbacks;
 import android.content.Context;
 import android.content.res.Configuration;
@@ skipping 196 matching lines @@
         // The DisplayManager API observers all display updates, so in theory it should not matter
         // which context is used to obtain it. If this turns out not to be true in practice, it's
         // possible register from all context used though quite complex.
         return ContextUtils.getApplicationContext();
     }
 
     private static DisplayManager getDisplayManager() {
         return (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);
     }
 
-    private static void updateDeviceDisplayInfo() {
+    private void updateDeviceDisplayInfo() {
+        if (mNativePointer == 0) return;
         DeviceDisplayInfo.create(getContext()).updateNativeSharedDisplayInfo();
     }
 
     @CalledByNative
     private static void onNativeSideCreated(long nativePointer) {
         DisplayAndroidManager singleton = getInstance();
         singleton.setNativePointer(nativePointer);
     }
 
     private DisplayAndroidManager() {}
@@ skipping 22 matching lines @@
         mBackend.startListening();
     }
 
     private void setNativePointer(long nativePointer) {
         mNativePointer = nativePointer;
         nativeSetPrimaryDisplayId(mNativePointer, mMainSdkDisplayId);
 
         for (int i = 0; i < mIdMap.size(); ++i) {
             updateDisplayOnNativeSide(mIdMap.valueAt(i));
         }
+        updateDeviceDisplayInfo();
     }
 
     /* package */ DisplayAndroid getDisplayAndroid(Display display) {
         int sdkDisplayId = display.getDisplayId();
         DisplayAndroid displayAndroid = mIdMap.get(sdkDisplayId);
         if (displayAndroid == null) {
             displayAndroid = addDisplay(display);
         }
         return displayAndroid;
     }
@@ skipping 24 matching lines @@
                 displayAndroid.getBitsPerPixel(), displayAndroid.getBitsPerComponent());
     }
 
     private native void nativeUpdateDisplay(long nativeDisplayAndroidManager, int sdkDisplayId,
             int physicalWidth, int physicalHeight, int width, int height, float dipScale,
             int rotationDegrees, int bitsPerPixel, int bitsPerComponent);
     private native void nativeRemoveDisplay(long nativeDisplayAndroidManager, int sdkDisplayId);
     private native void nativeSetPrimaryDisplayId(
             long nativeDisplayAndroidManager, int sdkDisplayId);
 }