From 0876250a17c9cff7119ef55c5bd070e24f078088 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Tue, 9 Apr 2024 09:47:03 +0000
Subject: [PATCH] Avoid NullPointerException when AppPicker onCreated called.

Bug: 333255617
Change-Id: Ia63230e97f0c11aa0fd5898be67bb84866f260dc
Test: manual
---
 src/com/android/settings/development/AppPicker.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/development/AppPicker.java b/src/com/android/settings/development/AppPicker.java
index 8f478b5e6fd..a11788cb83d 100644
--- a/src/com/android/settings/development/AppPicker.java
+++ b/src/com/android/settings/development/AppPicker.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.development;
 
+import android.app.ActionBar;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
@@ -57,7 +58,11 @@ public class AppPicker extends ListActivity {
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+
+        ActionBar actionBar = getActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
 
         mPermissionName = getIntent().getStringExtra(EXTRA_REQUESTIING_PERMISSION);
         mDebuggableOnly = getIntent().getBooleanExtra(EXTRA_DEBUGGABLE, false);