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

Skip to content
Commit 9ee42216 authored by Manish Kumar's avatar Manish Kumar
Browse files

Merge commit 'android-4.4.1_r1' into merge_branch

* commit 'android-4.4.1_r1': (373 commits)
  Stop wifi display discovery when no longer needed.
  Fix issue #11790471: Crash removed home buttons and notification bar/shade
  Revert "PreferenceFragment showing the breadcrumb when not needed."
  Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
  Make action bar media router icons blue again.
  Only scan for wifi display when there is no active connections
  Harden against transiently unavailable backup transports
  Mask OOBE when filtering recent documents.
  Notify apps when insets change.
  Fix incorrent page range parsing when custom print options used.
  Do not hold direct ref BatteryStatsImpl$Uid$Proc
  Use scaled display size in wallpaper constraint.
  Fix NPE in ConnectivityService
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Restore jankless transition keyguard-to-wallpaper
  Add config_restartRadioAfterProvisioning
  Disallow applications from initiating cast screen.
  Import translations. DO NOT MERGE
  ...

Conflicts:
	core/res/res/values/strings.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/AlarmManagerService.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/display/WifiDisplayController.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java

Change-Id: I3d3737341adfb137103de6892d33c6fe0a3160c3
parents 15d62b81 feef9887
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment