Commit Graph

301953 Commits

Author SHA1 Message Date
Paul Duffin
a7f974794b Merge "Move JUnit classes from here into external/junit" am: 552744390f
am: c62c3a51d5

Change-Id: I9c260108edea555dc75811b7d343ec33655397d9
2016-11-24 14:03:04 +00:00
Jorim Jaggi
57e2f4db35 Make LockoutResetCallback oneway
Test: Get locked out, make sure wake-and-unlock is working
again after 30 seconds.

Change-Id: I2fb03775898c0567f058d6d9d0b963ed071cc786
Fixes: 32946531
2016-11-24 14:50:54 +01:00
Paul Duffin
e3b757a4bf Move JUnit classes from here into external/junit am: 0342ab5b94 am: b9e33cd549
am: f99687ee83

Change-Id: I316f8094588a9849d173648cc3d30cc21ab7e607
2016-11-24 12:10:02 +00:00
Michal Karpinski
e0b7a06d6f Merge "Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users" 2016-11-24 11:59:14 +00:00
Paul Duffin
f99687ee83 Move JUnit classes from here into external/junit am: 0342ab5b94
am: b9e33cd549

Change-Id: I38ad58356388ab09506be9250812cbdb6522ddcd
2016-11-24 11:58:55 +00:00
Paul Duffin
c62c3a51d5 Merge "Move JUnit classes from here into external/junit"
am: 552744390f

Change-Id: I994dc5533d4f1dad35a161e998f57ecab56ab8a3
2016-11-24 11:57:48 +00:00
Paul Duffin
b9e33cd549 Move JUnit classes from here into external/junit
am: 0342ab5b94

Change-Id: I9111fe5e643794452008cf2cad933da0ca15bd00
2016-11-24 11:52:23 +00:00
Paul Duffin
552744390f Merge "Move JUnit classes from here into external/junit" 2016-11-24 11:44:02 +00:00
Andrei Stingaceanu
5cd7efb267 AutoSize TextView (part 1) - minimal end-to-end
Introduced the minimal number of attributes needed
to do autosizing and the autosize functions
bundled in TextView (for now). Note that in this
first version the autosizing can only be controlled
via construction.

Next: introduce getters/setters for the new attributes.

Bug: 32221168
Test: added a minimal smoke-ish CTS which exercises the
      new attributes.

Change-Id: Idf2195f6a600bfb7908b703ea046209b5868c521
2016-11-24 10:59:01 +00:00
Tomasz Mikolajewski
28a815c737 Add CATEGORY_TYPED_OPENABLE for ACTION_SEND[_MULTIPLE].
This category should be set when any virtual files are passed
via an Intent.

Test: CTS coming.
Bug: 28409713
Change-Id: I28eaecb3b8e9b604818adbdaf7fdaef1b4f9a564
2016-11-24 04:55:31 +00:00
TreeHugger Robot
a6fa8e5432 Merge "Change the task layout to better match mocks, add "in" animation" 2016-11-24 04:52:35 +00:00
TreeHugger Robot
ab3225d742 Merge "Introduce android.graphics.ColorSpace" 2016-11-24 04:05:20 +00:00
TreeHugger Robot
42e55d81bd Merge "ConnectivityServiceTest: fix testAvoidBadWifiSettings" 2016-11-24 03:57:01 +00:00
TreeHugger Robot
7149a23c2b Merge "Captive portal systel log improvements" 2016-11-24 03:45:57 +00:00
Romain Guy
68bd5fdd1a Introduce android.graphics.ColorSpace
This class can be used to define color spaces. A color space has a color model
and a profile connection space (CIE XYZ D50). This implementation can be used
to query various properties of RGB color spaces or perform conversions between
various color spaces (RGB, XYZ and Lab).

Refer to the documentation for more details.

Test: cts-tradefed run singleCommand cts-dev --module CtsGraphicsTestCases --test android.graphics.cts.ColorSpaceTest
Bug: 32984164
Change-Id: Ie2117c1212c1375a7d403d3c1afaf73d7c2e0b47
2016-11-23 18:10:04 -08:00
Hugo Benichi
8b025bf108 Captive portal systel log improvements
This patch improves system logging around captive portal detection to
make inspection of bug reports sligthly easier:

- NetworkMonitor now logs by default CMD_CAPTIVE_PORTAL_RECHECK and
  CMD_CAPTIVE_PORTAL_APP_FINISHED. Other system logs are kept off with
  a new VDBG boolean contant,
- NetworkNotificationManager now prints the notification id at
  notification time. This allows to easily correlate show and clear.
- errors in NetworkNotificationManager are logged as Throwable instead
  of through their implicit toString() method.

Test: $ runtest frameworks-net
Bug: 32198726
Change-Id: Id74a9912880083d41e27753240e781595081ff7a
2016-11-24 10:36:04 +09:00
Hridya Valsaraju
2ea296029f Modify GnssLocationProvider to use Treble Gnss HAL
Test: GPS functionality tested in binderized and pass-through modes on
Angler. All interfaces except AGnssRil, GnssNavigationMessage and
GnssNi. AGnssRil and AGnssNavigationMessage are not implemented by conventional
GPS HALs in Google devices that would be upgrading to O.

Change-Id: Ie4decb4c47892725c8c89bad3f48581550facff7
2016-11-23 17:16:59 -08:00
Jiabin Huang
76949b7339 Merge "TIF: Add support for more linux dvb device path." 2016-11-24 01:01:38 +00:00
Jean-Michel Trivi
ac48767f91 Conditional behavior for a11y stream volume
VolumePolicy: define two a11y modes: 1/ legacy where
  a11y volume aliases to media volume, 2/ a11y where
  the a11y volume is independent from any other stream
  type volume.
Refactor accessibility service listening to accomodate
  communicating to the volume controller when the
  a11y service is running.
Make accessibility stream alias conditional on a11y
  service running. Reflect the behavior in the
  volume controller.

Test: enable Talkback and verify logs in Vol controller
Bug 30448020

Change-Id: I80535ba259a22b6d93e62a7b3ca462a19d4c84b7
2016-11-23 16:31:38 -08:00
Etan Cohen
260823eba4 Merge "[AWARE] Move manager tests from service to manager directory" am: 018f6ec16f am: f74733a367 am: cd4be8b7e0
am: 28d58e1c95

Change-Id: Ie6ea910839b577914e56b0718345e45db16ab146
2016-11-24 00:19:16 +00:00
Etan Cohen
28d58e1c95 Merge "[AWARE] Move manager tests from service to manager directory" am: 018f6ec16f am: f74733a367
am: cd4be8b7e0

Change-Id: I47e247992f6084dfbabc898e58b9ade435626f16
2016-11-24 00:11:35 +00:00
Etan Cohen
cd4be8b7e0 Merge "[AWARE] Move manager tests from service to manager directory" am: 018f6ec16f
am: f74733a367

Change-Id: Ieae5bc0feb90671fc04db07a644696f90907cea3
2016-11-23 23:57:02 +00:00
Etan Cohen
f74733a367 Merge "[AWARE] Move manager tests from service to manager directory"
am: 018f6ec16f

Change-Id: I795e75882ac702c3637afa43ba2f73d612d74661
2016-11-23 23:50:27 +00:00
Mark Renouf
44ec5744f6 Disables swipe-to-dismiss windows for input methods on Wear am: 5514d77e7d am: 8f21ddf9e1
am: cbc723a857

Change-Id: I7d786972f9c00d3a5cbc73077fd0bc6345fca9ea
2016-11-23 23:47:13 +00:00
Sergei Vasilinetc
d7310ee338 Merge "Introduce Bitmap.Config.Hardware with @hide annotation" 2016-11-23 23:43:45 +00:00
Etan Cohen
018f6ec16f Merge "[AWARE] Move manager tests from service to manager directory" 2016-11-23 23:42:30 +00:00
Mark Renouf
cbc723a857 Disables swipe-to-dismiss windows for input methods on Wear am: 5514d77e7d
am: 8f21ddf9e1

Change-Id: I7c79cfd069f7be37d0de5d807ec1ffc02da6dbe4
2016-11-23 23:34:59 +00:00
Sudheer Shanka
027a33da6f Add comment in IActivityManager.aidl.
Bug: 30977067
Test: N/A
Change-Id: Ide7385f5d4493f45d75550c569457865107bf779
2016-11-23 15:25:33 -08:00
Mark Renouf
8f21ddf9e1 Disables swipe-to-dismiss windows for input methods on Wear
am: 5514d77e7d

Change-Id: I077b0e253fa26981970f9c13a87c560edfd93957
2016-11-23 23:21:02 +00:00
Manu Cornet
e138bd1955 Change the task layout to better match mocks, add "in" animation
This only adds an animation when transitioning into recents. "Out"
animations will come later as they need to be run in parallel with
launching the activity not to introduce any latency.

Test: Open recents on sw600dp device, check recents layout/animations
Bug: 32101881
Change-Id: I367f8e5c106cd06d2a7833c165ecb960a7821ed9
2016-11-23 14:48:30 -08:00
Jerome Gaillard
6edc28bf72 Merge "Fix tests when running from the command line" 2016-11-23 22:48:24 +00:00
Hall Liu
b222d2045d Add removeState method to StateMachine
Method to be used by BluetoothRouteManager in Telecom.

Test: unit tests in Telecom
Change-Id: Icdd1a3d42224246a5f26100fabb26313ce83b14c
2016-11-23 11:52:58 -08:00
Mark Renouf
44b97824c9 Disables swipe-to-dismiss windows for input methods on Wear am: 5514d77e7d am: 97a7d79d6b
am: 7e0facaac6

Change-Id: If6c7fd7831c1f57e55962d855c3f0cedfdd1e1af
2016-11-23 19:43:16 +00:00
Mark Renouf
7e0facaac6 Disables swipe-to-dismiss windows for input methods on Wear am: 5514d77e7d
am: 97a7d79d6b

Change-Id: Ib0708cc821f587f3e1c2143965ce188aef1764a0
2016-11-23 19:38:43 +00:00
Mark Renouf
97a7d79d6b Disables swipe-to-dismiss windows for input methods on Wear
am: 5514d77e7d

Change-Id: I75954a8a10bd5c18446bc38a742e3a6175c26df3
2016-11-23 19:33:44 +00:00
Adam Lesinski
9276b0adfb Merge "Move Resource creation out of ContextImpl constructor" 2016-11-23 19:19:35 +00:00
Android Build Merger (Role)
82323a7f80 Merge "Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp am: 39677cea6a am: 5b31fb39f2" 2016-11-23 18:41:00 +00:00
Baligh Uddin
7d1f7c555a Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp am: 39677cea6a
am: 5b31fb39f2

Change-Id: I51b980693c4d48fcf74ca85e0aba54fd2524bf42
2016-11-23 18:40:25 +00:00
John Reck
941acfe7c6 Merge "Add int[] JNI benchmarks" 2016-11-23 18:40:19 +00:00
Baligh Uddin
5b31fb39f2 Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp
am: 39677cea6a

Change-Id: I99a06cbdd5087ee7ce4528d7c3ef41bee1b29fa7
2016-11-23 18:36:03 +00:00
Baligh Uddin
977ec2b03c Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger am: b1df48d326 -s ours
am: fdbb74ef63

Change-Id: Ibc6010d35accc93b8083960876281a133d266766
2016-11-23 18:34:12 +00:00
Etan Cohen
b77b69545e [AWARE] Move manager tests from service to manager directory
Move operation - no functional tests. Only editorial changes:
- Remove (no longer) necessary import statements
- Removed reference to a constant sitting on the service side.
  Replaced with locally defined constant.

(cherry pick of commit 7ba5ad3c53dac62e56cd12dbe2054ce8374b6b92)

Bug: 32954930
Test: unit-tests pass
Change-Id: Ibe463fa73c27fc67996460eb91ea0222437927a6
2016-11-23 10:28:09 -08:00
Baligh Uddin
fdbb74ef63 Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
am: b1df48d326  -s ours

Change-Id: I915d9c44742a9e4193a5c405e0d4cfae770aaaf7
2016-11-23 18:26:38 +00:00
Baligh Uddin
39677cea6a Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp 2016-11-23 17:56:36 +00:00
Mark Renouf
5514d77e7d Disables swipe-to-dismiss windows for input methods on Wear
BUG: 33086263
Change-Id: I77ed17602cee2cf08f5265a60a1d7654e6e23960
2016-11-23 12:51:07 -05:00
Michal Karpinski
0d250200e3 Merge "Unhiding strong auth timeout API" 2016-11-23 17:42:58 +00:00
Jorim Jaggi
058b69e58a Merge "Revert "WindowList be gone!"" 2016-11-23 17:03:50 +00:00
Rubin Xu
bfc7faaf35 Fix boot loop when upgrading direclty from L to N
A second attempt to fix the upgrade problem due to SID == 0
in the above upgrade path. The previous fix contains a bug
where it would cause future attempts to unify work challenge
to silently fail, and crash SystemUi when unlocking.

This fix adds a check for non-zero SID before doing the initial work
profile unification (which caused the upgrade crash when SID == 0).
This means the initial work profile unification would only happen when
the user has unlocked the lockscreen and SID is generated.

Bug: 32490092
Bug: 33050562
Change-Id: Ib28951b2ec26b4f091df7763d9902f55616fcb5c
2016-11-23 16:59:22 +00:00
Jorim Jaggi
ffa5a9de0c Revert "WindowList be gone!"
This reverts commit 4551c8bbee.

Reason for revert: Broke a lot of things!

Bug: 33098800
Bug: 33098294
Change-Id: I307b1c7ee39445d6155a4bbce2bf5f289de55285
2016-11-23 16:59:19 +00:00
Jorim Jaggi
0796187e95 Deprecate FLAG_DISMISS_KEYGUARD
Since we now have an explicit dismiss method the flag is only
dangerous for falsing. The behavior will be migrated in the
following way:

- Insecure: Treat as FLAG_SHOW_WHEN_LOCKED
- Trusted: Actually dismiss Keyguard.
- Secure: Show bouncer.

We also restore the behavior to not allow dismissing the Keyguard
while it is occluded, which was the case in Nougat.

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
android.server.cts.KeyguardTests

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
android.server.cts.KeyguardLockedTests

Test: Insecure: Launch FLAG_DISMISS_KEYGUARD activity, make sure
Keyguard is occluded.

Test: Secure: Launch FLAG_DISMISS_KEYGUARD from SHOW_WHEN_LOCKED, make
sure bouncer is shown.

Test: Trusted: Launch FLAG_DISMISS_KEYGUARD from SHOW_WHEN_LOCKED, make
sure Keyguard gets unlocked.

Test: Trusted: Launch FLAG_DISMISS_KEYGUARD, lock screen, make sure
Keyguard is not dismissed/occluded.

Change-Id: I0d1ec9397a83975adb065c6cb81bf23b08c55395
2016-11-23 17:35:32 +01:00