Commit Graph

309172 Commits

Author SHA1 Message Date
Glen Kuhne
9ca5ddff4c Merge "Move wifi.proto to shared service .jar" 2017-02-21 17:27:04 +00:00
Peter Qiu
6ee49f2245 SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks
Previously, we were using provider name as the "SSID" for
Passpoint networks, and use it to compare against real SSIDs,
which obvious doesn't match.  So fix it.

Also removed the Passpoint specific logics in WifiTracker for
tracking Passpoint networks, since there shouldn't any
difference in tracking Passpoint APs and normal APs.

Additional work is still needed for managing installed
Passpoint configurations in the "Saved networks" page,
and it is being tracked by b/34207710. The Passpoint configuration
is not an "Access Point" per se, it is a network profile.

Bug: 34455883
Test: Install a Globla Reach Passpoint profile on a bullhead,
      verify device auto connects to a Global Reach AP and UI
      (QS, QS+, and Settings) correctly reflects it.

Change-Id: I63e66f683f8cb96e664516b130f5e7bc02358a10
Merged-In: I63e66f683f8cb96e664516b130f5e7bc02358a10
2017-02-21 17:20:42 +00:00
TreeHugger Robot
f8a420097e Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" 2017-02-21 17:20:13 +00:00
Stefano Tommasini
085bb4beff Merge "Add more instrumentation to BackupManager." 2017-02-21 17:08:11 +00:00
Winson Chung
e581ebfb7d Fixing regression in entering PiP over keyguard.
- The call to check the current system state before entering PiP should
  not check the keyguard visibility state when the activity is resumed.
  The caller (enterPictureInPictureMode()) will make that check itself
  and defer until entering PiP until the keyguard is gone.

Bug: 33645392
Test: android.server.cts.KeyguardLockedTests
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ib9a5d0f51400b8dd9146e3445c2415e2a458e690
2017-02-21 08:43:56 -08:00
Bryan Mawhinney
eb30161ab3 Merge "Move settings backup into separate class again" 2017-02-21 15:56:54 +00:00
Diego Perez
5780637259 Merge "Set MockView.setGravity to public" 2017-02-21 15:20:20 +00:00
George Mount
9659c4d646 Merge "Ensure transactions cannot be run during controller state change" 2017-02-21 15:19:03 +00:00
Philipp Weiß
c5b9bb9418 Merge "Show policy transparency dialog after failed screenshot" 2017-02-21 15:13:55 +00:00
Treehugger Robot
2c8229456a Merge "Reinstate USER_PRESENT for ConnectivityService" 2017-02-21 13:23:41 +00:00
Diego Perez
c98c16ded8 Merge "Add support for aapt:attr attributes" 2017-02-21 12:55:14 +00:00
Stefanot
2815496b32 Add more instrumentation to BackupManager.
This CL continues work of: ag/1835775 and ag/1870141 adding a few more
logging constans described here:
https://docs.google.com/document/d/1sUboR28LjkT1wRXOwVOV3tLo0qisiCvzxIGmzCVEjbI/edit#

Test: manual

BUG: 34873525
Change-Id: I8c81d8cfea5538e89de94919062eeff6ae09dce4
2017-02-21 12:44:32 +00:00
Andrei Stingaceanu
fc9ea84680 CalendarView Material - fix exception if date is out of range
Due to not cherry-picking this change into N_MR1 fix the
version check to reflect this.

Bug: 28019187
Test: run cts-dev -m CtsWidgetTestCases -t \
      android.widget.cts.CalendarViewTest
Change-Id: I128d25c3ed949729e2afaeefad381bfb58d89ccd
2017-02-21 11:27:03 +00:00
Bryan Mawhinney
2c5f95af6c Move settings backup into separate class again
This reverts commit 871f47c220,
fixes the blacklist and enables @Presubmit.  Also removes
unnecessary @TargetApi.

Test: run FrameworksCoreTests
Change-Id: I20176b4585d25a023389b3af6fbff63fca432548
2017-02-21 11:11:38 +00:00
Bryan Mawhinney
229316ad3e Merge "Revert "Move settings backup tests to own class"" 2017-02-21 10:53:03 +00:00
Bryan Mawhinney
871f47c220 Revert "Move settings backup tests to own class"
This reverts commit a990c74b2a.

Change-Id: I0b1bef2af10ba9b3499c69764fed125b8a25b3e9
2017-02-21 10:51:00 +00:00
Diego Perez
67ac03043c Set MockView.setGravity to public
The method is used from Studio so it needs to be public.

Test: N/A
Change-Id: I603de9ae0c8b719f5173eff152cc2558f734017e
2017-02-21 10:41:18 +00:00
Bryan Mawhinney
fbf550de5a Merge "Move settings backup tests to own class" 2017-02-21 10:14:59 +00:00
Erik Kline
14e3db3de5 Merge "Don't request information on unregistered callbacks" 2017-02-21 09:54:05 +00:00
Narayan Kamath
b7c4782c24 Merge "PackageParser: String interning fixes." 2017-02-21 09:47:08 +00:00
Diego Perez
bc9d2a13f0 Add support for aapt:attr attributes
Test: Tested from the studio side
Change-Id: Id506801f53cfc976c7352bd7f9632804862668b7
2017-02-21 09:34:49 +00:00
Diego Perez
8f52705b48 Merge "Fix BridgeContext.resolveThemeAttribute color parsing" 2017-02-21 09:30:05 +00:00
Erik Kline
32858e14ca Don't request information on unregistered callbacks
Test: as follows
    - build (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Bug: 35608572
Change-Id: I489e510ac131a7a624a652b12165104202a49f85
2017-02-21 17:22:14 +09:00
Wale Ogunwale
342479581e Fixed issues with child windows been IME targets
- Fixed issue with WindowState.getWindow() returning the parent window before
its children with positive sub-layers. Positive sub-layer children should be
returned first, then the parent window, and then negative sub-layer children.
This was causing the the parent window to be selected as the IME target
instead of the child on-top of it since they both can be IME targets and the
parent window was returned first.
- Fixed issue with WindowState.forAllWindow() not returning the IME window if
the current IME target is a child window.
- Add test WindowStateTest.testGetWindow(),
DisplayContentTests.testForAllWindows_WithChildWindowImeTarget(), and
DisplayContentTests.testComputeImeTarget() to cover the failing cases.

Change-Id: I0c93e0344601fc870011e8a8d84528f62b0a2a06
Fixes: 34786357
Fixes: 34306127
Fixes: 34711958
Fixes: 35362942
Test: bit FrameworksServicesTests:com.android.server.wm.WindowStateTests
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
2017-02-20 19:20:26 -08:00
Isaac Chen
d95aa50b18 Merge "Turned ENABLE_CPUSETS into runtime decision." 2017-02-21 02:05:24 +00:00
Andreas Gampe
a7993241a9 Graphics: Make SurfaceTexture compile-time initializable
Ensure that all static initializer code can be executed in the
compiler. Move native field caching into the native method
registration function.

Bug: 34956610
Test: m
Test: Device boots (Pixel)
Change-Id: Icf68c8fbadcaaa133a152942a3a7ba7aba84a1df
2017-02-20 16:18:24 -08:00
TreeHugger Robot
8dba8afc65 Merge "Suppress RescueParty when active USB connection." 2017-02-20 20:08:32 +00:00
TreeHugger Robot
586b6b2c3d Merge "Guard against possible AMS/PMS deadlock." 2017-02-20 19:57:21 +00:00
Chad Brubaker
3ed1b905c4 Merge "Use requesting userId for ApplicationInfo lookup" 2017-02-20 19:50:38 +00:00
TreeHugger Robot
27f8d6d977 Merge "Fix incorrect title in PreferenceActivity." 2017-02-20 19:30:35 +00:00
TreeHugger Robot
bde1c4a885 Merge "Revert "Modifying dpm.setSecureSetting call for install_non_market_apps"" 2017-02-20 18:50:54 +00:00
Bryan Mawhinney
a990c74b2a Move settings backup tests to own class
And adjust blacklists to make tests pass again

Test: run FrameworksCoreTests

Change-Id: I28fa4509e23728c97c532c38842340f99487e890
2017-02-20 18:35:37 +00:00
Jeff Sharkey
6e544617c6 Guard against possible AMS/PMS deadlock.
PMS can't call into AMS while holding its local lock.

Test: builds, boots
Bug: 35410906
Change-Id: Ib80bbee5c0c3e5fb39ffef324e8176027da83f2f
2017-02-20 11:02:29 -07:00
Jeff Sharkey
d9574c7bbf Suppress RescueParty when active USB connection.
When there is a very early system server runtime restart, we may not
yet have a published BatteryManagerInternal, so we need to go directly
to the "batteryproperties" native service to detect the USB state.

Test: builds, rescue is suppressed when USB is connected
Bug: 34872406
Change-Id: I949984cb95495c77de85ac322075177cff07b8b6
2017-02-20 10:45:27 -07:00
TreeHugger Robot
135e5aac1b Merge "Really fix regressions in IMMS#setImeWindowStatus" 2017-02-20 17:43:48 +00:00
Charles He
2b47e744e2 Display longer date string in certificate information
Previously the date string used for "issued on" and "expires on" fields
are in short format (e.g. 2/3/17), which is ambiguous. In this CL we
use the date format of medium length (e.g. 2 Mar 2017) which also
adjusts automatically to the system locale.

Bug: 34428233
Test: manual, by opening Settings > Security > Certificates > any
      certificate

Change-Id: I5eff133d5c621e3e9969c7cf22ec757bd2b48dc4
2017-02-20 17:32:12 +00:00
Victor Chang
5663e05109 Revert "Modifying dpm.setSecureSetting call for install_non_market_apps"
This reverts commit 2e7d6d64b9.

Bug: 35590590
Fix: 35590106
Test: runtest managed-provisioning
Test: manual verified that work profile can be inflated
Change-Id: Ie780b94053e65bca2f96b32055937c0c9e8beae8
2017-02-20 17:00:58 +00:00
Paul Duffin
88c0facc1e Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" am: 372b6b2c45 am: 3fbcd8cf38
am: dec65547e2

Change-Id: Icd19f7ae6a7628df97ee7e8e57d63ca51ad581cc
2017-02-20 16:10:16 +00:00
Paul Duffin
dec65547e2 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" am: 372b6b2c45
am: 3fbcd8cf38

Change-Id: Ie2bb70bea07f8642804cd6dc2e987e95e69ef633
2017-02-20 16:06:03 +00:00
Paul Duffin
3fbcd8cf38 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()"
am: 372b6b2c45

Change-Id: Iafa345df241f4f713451aa42a7169eddb57eb1ea
2017-02-20 15:59:06 +00:00
Treehugger Robot
372b6b2c45 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" 2017-02-20 15:47:53 +00:00
Paul Duffin
0589d8287e Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()
The previous changes to these files, which inlined the behavior
of Assert.assertTrue() were done in a hurry to fix the build.
This change makes use of the existing Utils.assertTrue() method
that was created for this purpose.

Bug: 30188076
Test: make checkbuild
Change-Id: Iacd505f8c3f7cefe6de94d30b56e39600bb9b0af
2017-02-20 13:27:38 +00:00
Paul Duffin
14fd9cebe9 Merge "Avoid using JUnit code in production WallpaperCropper" am: 9598c98db0 am: e4add524e9
am: 1f2955ad0d

Change-Id: I0921dc15784c2aff6b1b1c4ce33fe8aed0eaba98
2017-02-20 13:03:59 +00:00
Paul Duffin
1f2955ad0d Merge "Avoid using JUnit code in production WallpaperCropper" am: 9598c98db0
am: e4add524e9

Change-Id: I8c22e84feff3fa597403a7de6300528f823268d7
2017-02-20 12:56:22 +00:00
Paul Duffin
e4add524e9 Merge "Avoid using JUnit code in production WallpaperCropper"
am: 9598c98db0

Change-Id: I15b0bbe22d18feca699ecaf4146dc9e2c279e5b5
2017-02-20 12:48:55 +00:00
Narayan Kamath
07ac1442b5 PackageParser: String interning fixes.
Stop interning string metadata values as well as class names as it's
unlikely there will be much duplication among these.

Also make sure we intern the same set of strings when parsing packages
from their cache entries as we do when parsing them from the package
itself.

This change also improves error reporting for the unit-test and fixes
a failure that was introduced by a previous change (the addition of
static libraries).

Test: PackageParserTest
Bug: 34726698

Change-Id: Ia0d0342b91b3294bd5569756255918d1dc886e05
2017-02-20 12:40:21 +00:00
Paul Duffin
9598c98db0 Merge "Avoid using JUnit code in production WallpaperCropper" 2017-02-20 12:40:18 +00:00
Paul Duffin
c36ff4cf4f Avoid using JUnit code in production WallpaperCropper
Bug: 30188076
Test: make checkbuild
Change-Id: Ib6fe445a246d15dbabb8b86f9251b0059ed216b5
2017-02-20 12:37:35 +00:00
Philipp Weiß
02737595cb Merge "Remove Quicksettings footer in QuickQSPanel" 2017-02-20 12:04:20 +00:00
Jerome Gaillard
b01d3db742 Merge "Update FontFamily_Delegate following Change I1d6e1c4c" 2017-02-20 11:35:57 +00:00