OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge changes from topic 'background_inflation' into oc-dev
Selim Cinek [Mon, 8 May 2017 21:11:31 +0000 (21:11 +0000)]
Merge changes from topic 'background_inflation' into oc-dev

* changes:
  Fixed the contrast for low-priority notifications
  Moving Row inflation to the background too
  Moving the inflation to the background

7 years agoMerge "Also check if view visible to user before engaging fill" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 21:10:47 +0000 (21:10 +0000)]
Merge "Also check if view visible to user before engaging fill" into oc-dev

7 years agoMerge "Fixed placemente of Autofill UI for virtual views." into oc-dev
Felipe Leme [Mon, 8 May 2017 21:07:57 +0000 (21:07 +0000)]
Merge "Fixed placemente of Autofill UI for virtual views." into oc-dev

7 years agoMerge "DO NOT MERGE: Add light sample filtering logic for devices with ambient light...
Android Build Merger (Role) [Mon, 8 May 2017 21:05:59 +0000 (21:05 +0000)]
Merge "DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am: 5b8250964b am: cc1435b7f3  -s ours" into oc-dev

7 years agoDO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors...
Julius D'souza [Mon, 8 May 2017 21:05:07 +0000 (21:05 +0000)]
DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am: 5b8250964b
am: cc1435b7f3  -s ours

Change-Id: Ibdd53338d09ad1ad241023761b2ed8272f088b1f

7 years agoMerge "Properly measure dataset presentations" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 21:04:09 +0000 (21:04 +0000)]
Merge "Properly measure dataset presentations" into oc-dev

7 years agoDO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors...
Julius D'souza [Mon, 8 May 2017 20:57:56 +0000 (20:57 +0000)]
DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed.
am: 5b8250964b

Change-Id: Ifbebbcba8838b83a5c2e7d6d815784733cc95618

7 years agoMerge "Fix AuthenticationCallback leak in FingerprintManager" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:42:13 +0000 (20:42 +0000)]
Merge "Fix AuthenticationCallback leak in FingerprintManager" into oc-dev

7 years agoMerge "Toggling minimized state with overview moves divider to correct position"...
TreeHugger Robot [Mon, 8 May 2017 20:36:07 +0000 (20:36 +0000)]
Merge "Toggling minimized state with overview moves divider to correct position" into oc-dev

7 years agoMerge "Calls cancel on mDimAnimator to ensure that ref counts are accurate." into...
TreeHugger Robot [Mon, 8 May 2017 20:28:16 +0000 (20:28 +0000)]
Merge "Calls cancel on mDimAnimator to ensure that ref counts are accurate." into oc-dev

7 years agoMerge "Fixed scenario where an authentication response has no dataset." into oc-dev
TreeHugger Robot [Mon, 8 May 2017 19:20:06 +0000 (19:20 +0000)]
Merge "Fixed scenario where an authentication response has no dataset." into oc-dev

7 years agoAlso check if view visible to user before engaging fill
Svet Ganov [Sat, 6 May 2017 23:44:18 +0000 (16:44 -0700)]
Also check if view visible to user before engaging fill

Test: autofill CTS tests pass

bug:37753348

Change-Id: Ia16bff13f2cfdf1d315e3f45cc114ee13b145eb5

7 years agoProperly measure dataset presentations
Svetoslav Ganov [Sat, 6 May 2017 00:58:03 +0000 (17:58 -0700)]
Properly measure dataset presentations

Test: Autofill CTS tests pass

bug:37952199

Change-Id: Iaae714dd483ba44d5c7668b6fc7d386901b9d95c

7 years agoMerge "Additional log instrumentation for multi-user" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 18:52:34 +0000 (18:52 +0000)]
Merge "Additional log instrumentation for multi-user" into oc-dev

7 years agoMerge changes from topic 'wakelockTotalDuration' into oc-dev
TreeHugger Robot [Mon, 8 May 2017 18:34:32 +0000 (18:34 +0000)]
Merge changes from topic 'wakelockTotalDuration' into oc-dev

* changes:
  Wakelock durations are 0 instead of -1 if unused
  Added actual (unpooled) partial wakelock times.

7 years agoMerge "Night display status restored until valid state" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 18:20:29 +0000 (18:20 +0000)]
Merge "Night display status restored until valid state" into oc-dev

7 years agoMerge "Do not call updateApplicationInfo with mResourceManager lock" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 18:10:11 +0000 (18:10 +0000)]
Merge "Do not call updateApplicationInfo with mResourceManager lock" into oc-dev

7 years agoMerge "Fix ephemeral intent caching in notification" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 17:37:10 +0000 (17:37 +0000)]
Merge "Fix ephemeral intent caching in notification" into oc-dev

7 years agoMerge "Remove controller connection API" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 16:30:30 +0000 (16:30 +0000)]
Merge "Remove controller connection API" into oc-dev

7 years agoFix ephemeral intent caching in notification
Jason Monk [Mon, 8 May 2017 15:23:14 +0000 (11:23 -0400)]
Fix ephemeral intent caching in notification

Add some stuffs to make it not cache at bad times, or ever really...

Test: See bug, its long
Change-Id: I27987301ebf393de6f781b17ed7bc789789c01ab
Fixes: 37793400

7 years agoMerge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 14:49:20 +0000 (14:49 +0000)]
Merge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev

7 years agoNight display status restored until valid state
Justin Klaassen [Fri, 5 May 2017 22:19:33 +0000 (15:19 -0700)]
Night display status restored until valid state

Fixes: 38013048
Test: runtest -c com.android.server.NightDisplayServiceTest \
      frameworks-services

Change-Id: I8dc4177f89727a29ee6ab8e3db5a23c8127b800c

7 years agoMerge "Fix broken Backspace/ForwardDelete tests" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 13:21:27 +0000 (13:21 +0000)]
Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev

7 years agoMerge "Don't yell when calling into SystemUI" into oc-dev
Jorim Jaggi [Mon, 8 May 2017 12:51:42 +0000 (12:51 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev

7 years agoMerge "Clear Gatekeeper state before a new enrollment" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 12:02:45 +0000 (12:02 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev

7 years agoFix AuthenticationCallback leak in FingerprintManager
Kevin Chyn [Sun, 7 May 2017 22:35:17 +0000 (15:35 -0700)]
Fix AuthenticationCallback leak in FingerprintManager

Fixes: 32295793

Test: 1) modify/build/run apk attached in BR
2) run garbage collection after FingerprintActivity is done
3) use HPROF, FingerprintActivity should have "0 total count"
4) do this test for auth success, auth fail, auth cancel

Change-Id: I5fe7937a26d4673226b87c9c95a136dd9510e21f

7 years agoMerge "Defeat @Nullable String[] with empty list." into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev

7 years agoMerge "No quota-level details for public volumes." into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:38:15 +0000 (17:38 +0000)]
Merge "No quota-level details for public volumes." into oc-dev

7 years agoMerge "Only clear state for force stopped fill service" into oc-dev
TreeHugger Robot [Sun, 7 May 2017 01:17:02 +0000 (01:17 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev

7 years agoMerge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev
Dianne Hackborn [Sun, 7 May 2017 00:59:06 +0000 (00:59 +0000)]
Merge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev

7 years agoOnly clear state for force stopped fill service
Svet Ganov [Sat, 6 May 2017 23:12:16 +0000 (16:12 -0700)]
Only clear state for force stopped fill service

Test: manual

bug:37785814

Change-Id: I5e40a284788bacf1ebae5ddefffb93b1a5b47d39

7 years agoMerge "Add call super" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 22:46:37 +0000 (22:46 +0000)]
Merge "Add call super" into oc-dev

7 years agoAdd call super
Svet Ganov [Sat, 6 May 2017 02:38:45 +0000 (19:38 -0700)]
Add call super

Test: manual

bug:37775067

Change-Id: I50a50f1fbdb7e9c087c72ad0be3b767aeab9572a

7 years agoMerge "Prune abandoned autofill sessions" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 15:51:44 +0000 (15:51 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev

7 years agoMerge "Properly translate text locations to screen coords" into oc-dev
Phil Weaver [Sat, 6 May 2017 15:29:19 +0000 (15:29 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev

7 years agoMerge "Audio service: always unduck focus requester when granted" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 03:03:07 +0000 (03:03 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev

7 years agoMerge "Hide from the world that ssaid is in a dedicated table" into oc-dev
Svetoslav Ganov [Sat, 6 May 2017 02:41:50 +0000 (02:41 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev

7 years agoMerge "Report less data in structure to autofill provider" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 02:07:54 +0000 (02:07 +0000)]
Merge "Report less data in structure to autofill provider" into oc-dev

7 years agoMerge "Offer to wait until broadcasts have drained." into oc-dev
Jeff Sharkey [Sat, 6 May 2017 01:58:07 +0000 (01:58 +0000)]
Merge "Offer to wait until broadcasts have drained." into oc-dev

7 years agoMerge "Call ActivityManager to request activity relaunch" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:52:10 +0000 (01:52 +0000)]
Merge "Call ActivityManager to request activity relaunch" into oc-dev

7 years agoMerge "Prevent crashes when user is stopping" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:44:11 +0000 (01:44 +0000)]
Merge "Prevent crashes when user is stopping" into oc-dev

7 years agoMerge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev

7 years agoMerge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev
Jean-Michel Trivi [Sat, 6 May 2017 01:16:38 +0000 (01:16 +0000)]
Merge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev

7 years agoMerge "LightsService: open hal less aggressively" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:15:38 +0000 (01:15 +0000)]
Merge "LightsService: open hal less aggressively" into oc-dev

7 years agoAudio service: always unduck focus requester when granted
Jean-Michel Trivi [Fri, 5 May 2017 18:43:31 +0000 (11:43 -0700)]
Audio service: always unduck focus requester when granted

When an app is requesting focus, it might
  have been in the focus stack before, and ducked. Always
  unduck the associated players when the app requests audio
  focus and it is granted.
When an app gains focus from an another abandoning focus,
  do not make unducking conditional to having a focus
  dispatcher (== app has a focus listener).

Test: test app made to duck, re-request focus and verify not ducked
Bug: 37433811
Change-Id: I7e5b29c9148c923e7510957b971e28b6139d6156

7 years agoFixed scenario where an authentication response has no dataset.
Felipe Leme [Fri, 5 May 2017 21:02:21 +0000 (14:02 -0700)]
Fixed scenario where an authentication response has no dataset.

Also use getUiForShowing() on all relevant places, and added missing
SaveDataType value.

Test: LoginActivityTest.testFillResponseAuthServiceHasNoData()
Test: manual verification

Fixes: 37711385
Fixes: 38009452

Change-Id: Id69c831f96fb9ac35d1f2d86cfd41e76428c776e

7 years agoCall ActivityManager to request activity relaunch
Fyodor Kupolov [Fri, 5 May 2017 00:27:16 +0000 (17:27 -0700)]
Call ActivityManager to request activity relaunch

Instead of relaunching activity in-process, ask ActivityManager.
requestActivityRelaunch to relaunch it. It can make the correct
decision when activity needs to be relaunched.

Test: manual - switch between users to trigger ActivityThread.handleApplicationInfoChanged

Bug: 37992833
Bug: 37412579
Change-Id: I662a04e3cd82115a6008cef9308a2cf1038d51e1

7 years agoFix issue #38037532: Toasts cause apps to become foreground
Dianne Hackborn [Fri, 5 May 2017 06:27:23 +0000 (23:27 -0700)]
Fix issue #38037532: Toasts cause apps to become foreground

ForegroundToken is now ImportanceToken, and doesn't actually
cause an app to become foreground (that is not needed for
toasts anyway).

Also improved output and logging -- new logs for changing
in key uid stats, and when force stopping services after a
uid goes idle.

Test: manual

Change-Id: I44dd391bb8d37857be1359f4b7021dc8d2cd0285

7 years agoPrune abandoned autofill sessions
Philip P. Moltmann [Fri, 5 May 2017 20:30:38 +0000 (13:30 -0700)]
Prune abandoned autofill sessions

Regularly check if the sessions are still valid and clear the ones that
are not.

Test: 1. Started session in dialer
      2. Home button (dialer goes in background)
      3. kill -9 dialer
      4. Wait 30 seconds
      5. Start session is messenger
      6. dialer session stays

      1. Started session in dialer
      2. Home button (dialer goes in background)
      3. kill -9 dialer
      4. Swipe dialer from recents
      5. Wait 30 seconds
      5. Start session is messenger
      6. dialer session is removed
Fixes: 38005472

Change-Id: I8199ce44777b313141ee1eab6c8de5ad5089474a

7 years agoDo not call updateApplicationInfo with mResourceManager lock
Fyodor Kupolov [Fri, 5 May 2017 22:08:03 +0000 (15:08 -0700)]
Do not call updateApplicationInfo with mResourceManager lock

Otherwise it may cause a deadlock due to reversed lock ordering.

Test: create guest/switch/remove
Change-Id: Id11263ee2d358ab97b212477f896db7313605448
Fixes: 37347817

7 years agoHide from the world that ssaid is in a dedicated table
Svet Ganov [Fri, 5 May 2017 21:27:13 +0000 (14:27 -0700)]
Hide from the world that ssaid is in a dedicated table

Test: manual

bug:37793918

Change-Id: I7c7405c7bd192d528f1f87095a03a2d21953dbc8

7 years agoMerge "android.os.VintfObject: add API for EDI." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 21:47:43 +0000 (21:47 +0000)]
Merge "android.os.VintfObject: add API for EDI." into oc-dev

7 years agoMerge "Remove duplicated onBackStackChanged() call." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 21:42:55 +0000 (21:42 +0000)]
Merge "Remove duplicated onBackStackChanged() call." into oc-dev

7 years agoNo quota-level details for public volumes.
Jeff Sharkey [Fri, 5 May 2017 21:37:26 +0000 (15:37 -0600)]
No quota-level details for public volumes.

Fall back to whatever statvfs() tells us.

Test: builds, boots
Bug: 37573475
Change-Id: I713564292d41797e80860d6aa739266d9799af7f

7 years agoMerge "Adding SecureTouchListener to drop suspicious touches" into oc-dev
Suprabh Shukla [Fri, 5 May 2017 21:32:12 +0000 (21:32 +0000)]
Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev

7 years agoMerge "Improved dump() on Autofill UI." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 21:28:05 +0000 (21:28 +0000)]
Merge "Improved dump() on Autofill UI." into oc-dev

7 years agoDefeat @Nullable String[] with empty list.
Jeff Sharkey [Fri, 5 May 2017 21:26:13 +0000 (15:26 -0600)]
Defeat @Nullable String[] with empty list.

Test: builds, boots
Bug: 37577123
Change-Id: I6bf1af565398c30aecc0939a23846c0f85c13ffe

7 years agoReport less data in structure to autofill provider
Philip P. Moltmann [Thu, 4 May 2017 19:29:59 +0000 (12:29 -0700)]
Report less data in structure to autofill provider

Fixes: 35899963
Test: CtsAutoFillServiceTestCases, CtsAccessibilityTestCases,
      CtsAccessibilityServiceTestCases
Change-Id: Ia7dba3e252e7678c033d67bcf653e592f3134304

7 years agoProperly translate text locations to screen coords
Phil Weaver [Fri, 5 May 2017 21:17:06 +0000 (14:17 -0700)]
Properly translate text locations to screen coords

Using the same method as getBoundsInScreen.

Bug: 35095925
Test: Manually verified location with test app, ran a11y cts
Change-Id: I1eee2a4eb23912698be61c9030d92bbade1d743a

7 years agoPrevent crashes when user is stopping
Fyodor Kupolov [Fri, 5 May 2017 21:07:50 +0000 (14:07 -0700)]
Prevent crashes when user is stopping

Added defensive checks to prevent sporadic crashes due to various race
conditions when user is stopped:
* onPackageBroadcastReceived - moved the check inside the synchronized block.
  This guarantees that onUserStopped (that also grabs mLock) is not yet
  called and we can proceed.
* stopListening - Since it is invoked before onUserStopped callback, we can call
  ensureGroupStateLoadedLocked(userId, false). The state will be subsequently cleaned
  up in the onUserStopped.

Test: manual user switching + SecondaryUserContentResolverTest and
      ManagedUserContentResolverTest
Fixes: 37472670
Fixes: 36890589

Change-Id: I44d0a0c004e9c3e6cfb37a24cb8a5b6f20a42f13

7 years agoOffer to wait until broadcasts have drained.
Jeff Sharkey [Wed, 3 May 2017 17:38:01 +0000 (11:38 -0600)]
Offer to wait until broadcasts have drained.

We've seen evidence of lab devices racing with other apps that are
using cache space immediately after tests wipe it clean, which can
cause test failures.  To mitigate this, try our best to wait for the
device to go "idle" by watching for broadcast queues to fully drain.

Also improve javadocs along the way.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37486230375669833791344237914374
Change-Id: I4d430db443b6fa6d33a625fe07b90279b5d51c12

7 years agoMerge "Fix issue in InsetDrawable where master inset attribute get ignored. Test...
Hyunyoung Song [Fri, 5 May 2017 20:52:48 +0000 (20:52 +0000)]
Merge "Fix issue in InsetDrawable where master inset attribute get ignored. Test: builds, and did manual test b/37752336" into oc-dev

7 years agoMerge "Reject smart selection if outside original selection." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:29:27 +0000 (20:29 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev

7 years agoMerge "Update carrier text when phone service state is changed" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:25:44 +0000 (20:25 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev

7 years agoMerge "Show warning log when ShortcutInfo is re-published" into oc-dev
Makoto Onuki [Fri, 5 May 2017 20:11:02 +0000 (20:11 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev

7 years agoMerge "WifiManagerTest: alt way to check callback" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:04:14 +0000 (20:04 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev

7 years agoLightsService: open hal less aggressively
Steven Moreland [Fri, 5 May 2017 18:41:51 +0000 (11:41 -0700)]
LightsService: open hal less aggressively

Only try to reopen the hal if it has been successfully opened before.

Test: remove lights hal from marlin, no more spam
Test: use with ToT marlin, lights hal still works

Fixes: 38006310
Change-Id: Ib21e26184f8a94987d005c8d320ec4d988df66ee

7 years agoToggling minimized state with overview moves divider to correct position
Matthew Ng [Fri, 28 Apr 2017 20:58:49 +0000 (13:58 -0700)]
Toggling minimized state with overview moves divider to correct position

When docking any app with overview on the bottom and continuously press
the overview button would not cause the position before minimized
variable to record an incorrect position. Instead only record when not
animating so that the original position is kept. Then after unminimizing
the docked stack, it will return back to the original position that was
recorded.

Change-Id: Ia9da24dcb2a5be1f10be3797007e02b1a1425345
Fixes: 35642296
Test: manual

7 years agoMerge "Create auxiliary info for local instant apps" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 19:35:22 +0000 (19:35 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev

7 years agoMerge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into...
Sergey Vasilinets [Fri, 5 May 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev

7 years agoMerge "Use the StorageStatsManager in FileCollector." into oc-dev
Daniel Nishi [Fri, 5 May 2017 18:57:41 +0000 (18:57 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev

7 years agoMerge "Update process state after unbinding a service." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:51:56 +0000 (18:51 +0000)]
Merge "Update process state after unbinding a service." into oc-dev

7 years agoMerge "Resolve styles by font table if not specified." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Resolve styles by font table if not specified." into oc-dev

7 years agoMerge "Revert "Treat apps that use channels as O apps"" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:50:52 +0000 (18:50 +0000)]
Merge "Revert "Treat apps that use channels as O apps"" into oc-dev

7 years agoMerge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
Ajay Panicker [Fri, 5 May 2017 18:45:08 +0000 (18:45 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev

7 years agoUpdate carrier text when phone service state is changed
Akira Oshimi [Tue, 31 Jan 2017 05:34:59 +0000 (14:34 +0900)]
Update carrier text when phone service state is changed

The carrier text is not updated when the phone service state has
changed. To solve this issue, the EmergencyCryptkeeperText view should
receive the KeyguardUpdateMonitorCallback#onRefreshCarrierInfo().

Bug: 37331677
Test: visual

Change-Id: I359991688552b731eaa02f443902eb7bdc894d10
(cherry picked from commit 76c36c4dc5eb2195c918590b23c16f6410a52df0)

7 years agoWifiManagerTest: alt way to check callback
Rebecca Silberstein [Tue, 2 May 2017 20:21:00 +0000 (13:21 -0700)]
WifiManagerTest: alt way to check callback

We are seeing failures on automated tests.  This is occuring when the
thread id is retrieved from the TestLooper.  Since we do not have
control over exactly which thread is used in the TestLooper for these
environments, this CL changes the checks to make sure the the callback
is called, and also that we never attempt to get the main looper (the
behavior when the provided handler is null).

Bug: 37828843
Test:  frameworks/base/wifi/tests/runtests.sh
Change-Id: I853c423b5f383225c250357d638c4cfd2c098edc

7 years agoDon't crash in TextUtil.concat() with paragraph spans
Roozbeh Pournader [Wed, 3 May 2017 01:10:10 +0000 (18:10 -0700)]
Don't crash in TextUtil.concat() with paragraph spans

This switches TextUtils.concat() to use SpannableStringBuilder
if there are any spans in the input strings. As a result, we can
avoid crashes when concatenating two CharSequences can result in
paragraph spans that now don't happen to be at paragraph boundaries.

Also document the exact behavior of the method for edge cases based
on the previous implementation.

Change-Id: I9caffbe95ed729b9c10d63a9e7d22b1e8c7185a3
Fixes: 28271770
Test: CTS tests added and old CTS tests continue to pass.
Test: cts-tradefed run cts-dev --module CtsTextTestCases --test android.text.cts.TextUtilsTest

7 years agoMerge "Fixing regression in what is considered a restart attempt" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:03:49 +0000 (18:03 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev

7 years agoMerge "TextClassifier: Remove debug logs." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 17:49:38 +0000 (17:49 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev

7 years agoCreate auxiliary info for local instant apps
Todd Kennedy [Fri, 5 May 2017 17:15:38 +0000 (17:15 +0000)]
Create auxiliary info for local instant apps

This reverts commit a1d8051fa2317d897a6b20442177e357172e93db.

Change-Id: Ic471a4efe64406dd75cc0bf1d6464276a94347d8
Fixes: 37947648
Test: Manual
Test: Install an instant app [https://www.nytimes.com/crosswords/game/mini]
Test: Try to run installed instant app from gMail

7 years agoMerge "Add wifi throttling to backup blacklist." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 17:15:48 +0000 (17:15 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev

7 years agoReject smart selection if outside original selection.
Abodunrinwa Toki [Fri, 5 May 2017 17:07:17 +0000 (18:07 +0100)]
Reject smart selection if outside original selection.

- The aim is to be defensive and prefer to reject a selection if
  it is likely to be wrong.

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 38019270
Change-Id: I35ebc84fb102373949366296434a31d899edfef3

7 years agoRevert "Treat apps that use channels as O apps"
Geoffrey Pitsch [Fri, 5 May 2017 16:47:38 +0000 (16:47 +0000)]
Revert "Treat apps that use channels as O apps"

This reverts commit 07a08b2ae92cc26b5e7ec00064e6ecea79d3d9c3.
Bug: 38016678
Change-Id: I0bf2f6da9e145bfe1f79449cac38ad34f5956969

7 years agoMerge "Make status bar disable() debugging more concise." into oc-dev
Daniel Sandler [Fri, 5 May 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Make status bar disable() debugging more concise." into oc-dev

7 years agoAudioAudioPolicyFocusListener and ducking enforced by framework
Jean-Michel Trivi [Fri, 5 May 2017 16:44:28 +0000 (09:44 -0700)]
AudioAudioPolicyFocusListener and ducking enforced by framework

Notify AudioPolicyFocusListener an app received
  AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK even when focus is enforced by
  the framework.

Test: see bug
Bug: 37241497
Change-Id: I569e6611fb398955adbcd5bbfbda9d44db4aa729

7 years agoResolve styles by font table if not specified.
Seigo Nonaka [Thu, 4 May 2017 23:39:28 +0000 (16:39 -0700)]
Resolve styles by font table if not specified.

android:fontStyle and android:fontWeight is an optional attribute.
If they are missing, we are using non-italic 400 weight, but this is
not good idea. We should resolve these style value from font metadata.

Bug: 37988154
Test: am instrument -w -e class android.content.res.cts.ResourcesTest
      android.content.cts/android.support.test.runner.AndroidJUnitRunner

Change-Id: I80a436cd3632d8c58fa3d8bdaedac73b95f61a8c

7 years agoMerge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev
Bryce Lee [Fri, 5 May 2017 16:29:37 +0000 (16:29 +0000)]
Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev

7 years agoMerge "Fix settings test for show_notification_channel_warnings" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 16:20:53 +0000 (16:20 +0000)]
Merge "Fix settings test for show_notification_channel_warnings" into oc-dev

7 years agoMerge "WifiManagerTest: test for startLOHS return code" into oc-dev
Rebecca Silberstein [Fri, 5 May 2017 16:06:50 +0000 (16:06 +0000)]
Merge "WifiManagerTest: test for startLOHS return code" into oc-dev

7 years agoMerge "ImageWriter: Attach non-opaque Images as well." into oc-dev
Eino-Ville Talvala [Fri, 5 May 2017 16:06:03 +0000 (16:06 +0000)]
Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev

7 years agoFixing regression in what is considered a restart attempt
Winson Chung [Fri, 5 May 2017 01:25:21 +0000 (18:25 -0700)]
Fixing regression in what is considered a restart attempt

- CTS tests can start activities directly in the pinned stack with the
  CLEAR_TASK and NEW_TASK flags, so this check should only consider it
  a restart attempt if mReusedTask is set, as in
  setTaskFromIntentActivity(), otherwise the newly started activity
  will be triggered back into fullscreen.

Bug: 37501224
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ia37f9d77bfb85882e50271300234bfc6c2969f9a

7 years agoMerge "Ensure that we hide the menu without resizing when expanding." into oc-dev
Winson Chung [Fri, 5 May 2017 15:52:13 +0000 (15:52 +0000)]
Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev

7 years agoMerge "Revert "Create auxiliary info for local instant apps"" into oc-dev
Bryce Lee [Fri, 5 May 2017 15:46:32 +0000 (15:46 +0000)]
Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev

7 years agoRevert "Create auxiliary info for local instant apps"
Bryce Lee [Fri, 5 May 2017 15:38:44 +0000 (15:38 +0000)]
Revert "Create auxiliary info for local instant apps"

This reverts commit e15e7cb592a923eea029c12aa9fc144a3fbaddc0.

Change-Id: I116904fd8c2b28df7e03bc5ec2414ed67761b380

7 years agoMerge "Add TRON logging for bindApplication" into oc-dev
Jorim Jaggi [Fri, 5 May 2017 15:34:52 +0000 (15:34 +0000)]
Merge "Add TRON logging for bindApplication" into oc-dev

7 years agoMerge "Audio service: always unduck focus winner" into oc-dev
Jean-Michel Trivi [Fri, 5 May 2017 15:33:42 +0000 (15:33 +0000)]
Merge "Audio service: always unduck focus winner" into oc-dev

7 years agoFixed placemente of Autofill UI for virtual views.
Felipe Leme [Fri, 5 May 2017 01:31:24 +0000 (18:31 -0700)]
Fixed placemente of Autofill UI for virtual views.

The PopupWindow anchoring offset should be based on the bottom of the anchor
view, but we were using top. Hence, the PopupWindow.tryFitVertical() was
failing to place it above the view in some cases, even when there was plenty
of space.

Fixes: 37991460
Test: manual verification with virtual view sample
Test: CtsAutoFillServiceTestCases pass

Change-Id: Iffdfe0d7858e865192338184d63bf5b93ba7108f

7 years agoMerge "Fix bounds calculation" into oc-dev
Jorim Jaggi [Fri, 5 May 2017 14:59:39 +0000 (14:59 +0000)]
Merge "Fix bounds calculation" into oc-dev

7 years agoFix broken Backspace/ForwardDelete tests
Andrei Stingaceanu [Fri, 5 May 2017 14:43:52 +0000 (15:43 +0100)]
Fix broken Backspace/ForwardDelete tests

* correctly use @Before to intstantiate
* get rid of useless KeyListenerTestCase class
* move to KeyUtils, refactor and document util method to generate
  a KeyEvent

Bug: 37991689
Test: adb shell am instrument -w -e package android.text.method
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ibbce351f31eb62492cd1c7c920fdef44df89b683