OSDN Git Service

android-x86/frameworks-base.git
7 years agoPlugin fragment support
Jason Monk [Thu, 3 Nov 2016 13:07:20 +0000 (09:07 -0400)]
Plugin fragment support

Allows fragments to be easily switched over to plugins and a provides
a convenient base class for plugins to use that makes sure the layout
inflater and context point at the plugin's and not sysui's.

Bug: 32609190
Test: runtest systemui

Change-Id: I6503947e980f66ddcd826f6ca9a92b591ce0eb1e

7 years agoMove QS to a fragment
Jason Monk [Wed, 2 Nov 2016 18:05:23 +0000 (14:05 -0400)]
Move QS to a fragment

There is now a bit too much of the view/layout logic touching the
fragment, but sort out that later and get something over to fragments
for now.

Bug: 32609190
Test: Manual
Change-Id: Icf677f4a70e6b92892a0fc27a0e673940ebc7a73

7 years agoFragments in SysUI!
Jason Monk [Mon, 31 Oct 2016 14:18:20 +0000 (10:18 -0400)]
Fragments in SysUI!

Add system to add fragments to sysui windows for better code
modularity and testability.

Bug: 32609190
Test: Manual
Change-Id: I2ae7ed6133aff3fc5cdbdb3ec89d55183b7ac797

7 years agoMerge "Update testActivity"
Jerome Gaillard [Fri, 11 Nov 2016 12:56:45 +0000 (12:56 +0000)]
Merge "Update testActivity"

7 years agoMerge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a...
liangweikang [Fri, 11 Nov 2016 03:46:14 +0000 (03:46 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a3 am: 45562df8bb am: b95e567919
am: 04a9be65c8

Change-Id: I94321a4192a854feb171b35fc2930887095d2da3

7 years agoMerge changes I7918c0a3,I19d87fc1
Yohei Yukawa [Fri, 11 Nov 2016 03:40:27 +0000 (03:40 +0000)]
Merge changes I7918c0a3,I19d87fc1

* changes:
  Support content URIs w/ userId in IC#commitContent
  Fix up content URI for different users

7 years agoMerge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a...
liangweikang [Fri, 11 Nov 2016 03:39:39 +0000 (03:39 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a3 am: 45562df8bb
am: b95e567919

Change-Id: I2916de2a4c09849e12bff2dea5a4cd34c080b2f9

7 years agoSupport content URIs w/ userId in IC#commitContent
Yohei Yukawa [Thu, 10 Nov 2016 08:47:48 +0000 (00:47 -0800)]
Support content URIs w/ userId in IC#commitContent

With this CL, one can specify a content URI with an embedded user ID to
InputContentInfo, like such a URI is supported in
Context#grantUriPermission().

Note that such a scenario is actually possible when 1) an application
running as User X sets a content URI to the system clipboard then 2) the
IME runing as User Y who share the clipboard with User X obtains the
content URI from the system and tries to create a new instance of
InputContentInfo.

Bug: 32427307
Bug: 32778718
Test: 'adb shell dumpsys activity permissions' with a custom IME that
      instantiates InputContentInfo from the content URI obtained from
      the clipboard.
Change-Id: I7918c0a379b8f3e7e64b106447b42447876f9057

7 years agoFix up content URI for different users
Yohei Yukawa [Thu, 10 Nov 2016 08:40:56 +0000 (00:40 -0800)]
Fix up content URI for different users

Currently Commit Content API work only when the content URI provided by
the IME is accessible to the target application.  This is non-trivial if
the target application is running as a different user (profile) and it
is actually a possible scenario when managed profile is enabled.

This CL takes care of such a situation, by fixing up the content URI
when and only when InputContentInfo#getContentUri() is called from a
different user than the owner of the content URI.

This CL also makes it clear that we currently do not support content
URIs that already have embedded user IDs.  Since
IActivityManager#grantUriPermissionFromOwner() does not support such
URIs, we should have had a special handling for such a case, which will
be addressed in a subsequent CL.

Bug: 32427307
Bug: 32778718
Test: Made sure that Commit Content API works as expected on a managed
      profile created by
      https://github.com/googlesamples/android-testdpc
Change-Id: I19d87fc19beea248f49b59ec5a5711b95bcbb466

7 years agoMerge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a3
liangweikang [Fri, 11 Nov 2016 03:32:05 +0000 (03:32 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a3
am: 45562df8bb

Change-Id: Ibd3818f9b37ee58c6225a9b6d7cefd486f20bdb9

7 years agoMerge "fixed applyConfigurationToResourcesLocked WeakReference is null"
liangweikang [Fri, 11 Nov 2016 03:25:41 +0000 (03:25 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null"
am: 264d1f12a3

Change-Id: Icfaf039b078d7ce43b23bed09cd0102427c6f047

7 years agoMerge "fixed applyConfigurationToResourcesLocked WeakReference is null"
Treehugger Robot [Fri, 11 Nov 2016 03:16:42 +0000 (03:16 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null"

7 years agoMerge "Adding experiment for minimized pinned stack."
TreeHugger Robot [Fri, 11 Nov 2016 00:54:10 +0000 (00:54 +0000)]
Merge "Adding experiment for minimized pinned stack."

7 years agoMerge "Customize camera gesture vibrator pattern"
TreeHugger Robot [Fri, 11 Nov 2016 00:43:51 +0000 (00:43 +0000)]
Merge "Customize camera gesture vibrator pattern"

7 years agoMerge "In MountEmulatedStorage() don't create a mount namespace unless actually mount...
Robert Sesek [Fri, 11 Nov 2016 00:32:02 +0000 (00:32 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting." am: c0aacbe513 am: ae06fba67a am: b82970846b
am: 97d99600e9

Change-Id: Id8d0d78e01bd8e0e876fa4564eee67fe18937065

7 years agoMerge "In MountEmulatedStorage() don't create a mount namespace unless actually mount...
Robert Sesek [Fri, 11 Nov 2016 00:25:51 +0000 (00:25 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting." am: c0aacbe513 am: ae06fba67a
am: b82970846b

Change-Id: I02bb609e76bd44130e9d3dd4082e134d935376cd

7 years agoMerge "In MountEmulatedStorage() don't create a mount namespace unless actually mount...
Robert Sesek [Fri, 11 Nov 2016 00:19:54 +0000 (00:19 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting." am: c0aacbe513
am: ae06fba67a

Change-Id: I644fc487b90e4292d3a53f356e92c4ddee856aaa

7 years agocolors: add missing accent_material_{700,50} resources. am: fade1235e5 am: 8da11f44ef
Alain Vongsouvanh [Fri, 11 Nov 2016 00:15:24 +0000 (00:15 +0000)]
colors: add missing accent_material_{700,50} resources. am: fade1235e5 am: 8da11f44ef
am: 577d218d81

Change-Id: I4197d8873dd08005ba42d85b4f5e1b6c3ab21a77

7 years agoMerge "In MountEmulatedStorage() don't create a mount namespace unless actually mount...
Robert Sesek [Fri, 11 Nov 2016 00:13:57 +0000 (00:13 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."
am: c0aacbe513

Change-Id: I7199d687e2e67dd4672bcb388053c33db6b693f5

7 years agocolors: add missing accent_material_{700,50} resources. am: fade1235e5
Alain Vongsouvanh [Fri, 11 Nov 2016 00:03:24 +0000 (00:03 +0000)]
colors: add missing accent_material_{700,50} resources. am: fade1235e5
am: 8da11f44ef

Change-Id: I3e539a08a55bf4e2752f07a57176e1c2ec1a85e3

7 years agoMerge "In MountEmulatedStorage() don't create a mount namespace unless actually mount...
Treehugger Robot [Fri, 11 Nov 2016 00:02:45 +0000 (00:02 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."

7 years agocolors: add missing accent_material_{700,50} resources.
Alain Vongsouvanh [Thu, 10 Nov 2016 23:55:48 +0000 (23:55 +0000)]
colors: add missing accent_material_{700,50} resources.
am: fade1235e5

Change-Id: I8d1863ef7803f92ddc4ffe41b02474f0468c88c6

7 years agoMerge "Improve support for half floats and expose as public API"
Romain Guy [Thu, 10 Nov 2016 23:55:15 +0000 (23:55 +0000)]
Merge "Improve support for half floats and expose as public API"

7 years agoMerge "Perform camera permission and app ops check when setting camera for VT."
Tyler Gunn [Thu, 10 Nov 2016 23:32:27 +0000 (23:32 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."

7 years agoCustomize camera gesture vibrator pattern
Oleksiy Avramchenko [Mon, 3 Oct 2016 11:11:08 +0000 (13:11 +0200)]
Customize camera gesture vibrator pattern

Value for camera gesture vibrator pattern changes between versions, e.g.
it was changed from 1000 to 750 in 7.0, which seems arbitrary and OEMs do
not stick with this value, but change it according to their requirements.

This change allows the value to be customized using overlays.

Bug: 32789246
Change-Id: I19e59d1fa191657a8575c486008db3991b347fc5

7 years agoAdding experiment for minimized pinned stack.
Winson Chung [Tue, 8 Nov 2016 23:45:10 +0000 (15:45 -0800)]
Adding experiment for minimized pinned stack.

- Also refactoring the PIP touch handling to be independent gestures

Test: Enable the setting in SystemUI tuner, then drag the PIP slightly
      offscreen. This is only experimental behaviour, and
      android.server.cts.ActivityManagerPinnedStackTests will be updated
      accordingly if we keep this behavior.

Change-Id: I5834971fcbbb127526339e764e7d76b5d22d4707

7 years agoMerge "Adding API for apps to specify their aspect ratio when entering PIP."
Winson Chung [Thu, 10 Nov 2016 23:08:52 +0000 (23:08 +0000)]
Merge "Adding API for apps to specify their aspect ratio when entering PIP."

7 years agoMerge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38 am: 5451f827...
Peter Qiu [Thu, 10 Nov 2016 22:43:59 +0000 (22:43 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38 am: 5451f8279e am: 8e07f4a86e
am: 6405b98114

Change-Id: Ifb223a9c0573571875979a7f55e6ede53ac12a4e

7 years agocolors: add missing accent_material_{700,50} resources.
Alain Vongsouvanh [Thu, 10 Nov 2016 21:18:35 +0000 (13:18 -0800)]
colors: add missing accent_material_{700,50} resources.

Those two resources were only defined for watches and had no default
counterparts.

BUG: 32786346
Change-Id: I0868d34d1df55c6dfd26d13c3a7d468866603a97

7 years agoMerge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManage...
Ta-wei Yen [Thu, 10 Nov 2016 22:28:13 +0000 (22:28 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd am: 969a6eb2b8 am: c9698a5cff
am: e1ae654041

Change-Id: Ic28680327d916e3650b3c11fb253353955373922

7 years agoMerge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38 am: 5451f8279e
Peter Qiu [Thu, 10 Nov 2016 22:26:22 +0000 (22:26 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38 am: 5451f8279e
am: 8e07f4a86e

Change-Id: I6ca161fcd10af6c2da26c585f870906284737ccf

7 years agoMerge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManage...
Ta-wei Yen [Thu, 10 Nov 2016 22:20:29 +0000 (22:20 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd am: 969a6eb2b8
am: c9698a5cff

Change-Id: I35bbcf29868c1ecddcdbb0e536c6d2a92e4d90ca

7 years agoMerge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38
Peter Qiu [Thu, 10 Nov 2016 22:13:48 +0000 (22:13 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38
am: 5451f8279e

Change-Id: Ide84930e6d76e9e52716a5b31df31998b95a8a76

7 years agoMerge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManage...
Ta-wei Yen [Thu, 10 Nov 2016 22:08:35 +0000 (22:08 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd
am: 969a6eb2b8

Change-Id: I2a5d31c342efc7e3ca4f29448b24d406253c7b0f

7 years agoMerge "wifi: hotspot2: add Passpoint APIs to WifiManager"
Peter Qiu [Thu, 10 Nov 2016 22:07:11 +0000 (22:07 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
am: 0295d7bd38

Change-Id: I79279f22bfc9642ed7905d099dd43555714ea815

7 years agoMerge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManage...
Ta-wei Yen [Thu, 10 Nov 2016 22:02:17 +0000 (22:02 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
am: 0a3b6b70dd

Change-Id: I512e68bccda115ad7c58ec1f1fbfbb2c69c86578

7 years agoMerge "wifi: hotspot2: add Passpoint APIs to WifiManager"
Treehugger Robot [Thu, 10 Nov 2016 21:56:55 +0000 (21:56 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"

7 years agoMerge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManage...
Ta-wei Yen [Thu, 10 Nov 2016 21:46:34 +0000 (21:46 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"

7 years agoMerge "Expose dismiss reasons to notification listeners."
Julia Reynolds [Thu, 10 Nov 2016 20:46:04 +0000 (20:46 +0000)]
Merge "Expose dismiss reasons to notification listeners."

7 years agoMerge "Not blocking focus on action bar on tab"
TreeHugger Robot [Thu, 10 Nov 2016 20:45:23 +0000 (20:45 +0000)]
Merge "Not blocking focus on action bar on tab"

7 years agoMerge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e81...
Peter Qiu [Thu, 10 Nov 2016 20:43:05 +0000 (20:43 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e817fdcf am: 861e99e815 am: 861619e782
am: e0ebb9ce31

Change-Id: If6486ed34e20f225b588fcae0a32ca41c1531786

7 years agoMerge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e81...
Peter Qiu [Thu, 10 Nov 2016 20:36:08 +0000 (20:36 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e817fdcf am: 861e99e815
am: 861619e782

Change-Id: I3f148b1e87f8a4d43f6a48e3af774f7f2b216023

7 years agoMerge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6...
Jakub Pawlowski [Thu, 10 Nov 2016 20:31:12 +0000 (20:31 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6 am: f59ad8bd68
am: 196fe3597c

Change-Id: Idf087fc9dcd88733ec7755196fab3eac944bf8cf

7 years agoMerge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3 am...
Akira Oshimi [Thu, 10 Nov 2016 20:24:23 +0000 (20:24 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3 am: 08978cd0fd am: 88ab92ce4c
am: c49702e4c0

Change-Id: I7d3c453536a272c969745ad2df4c9bf319efc19b

7 years agoMerge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6
Jakub Pawlowski [Thu, 10 Nov 2016 20:24:10 +0000 (20:24 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6
am: f59ad8bd68

Change-Id: I8307894e80bdfc1c260708c7174d294178ffa00b

7 years agoMerge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e81...
Peter Qiu [Thu, 10 Nov 2016 20:24:06 +0000 (20:24 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e817fdcf
am: 861e99e815

Change-Id: Idd093095c6c7be414e284092069df1374aad9d38

7 years agoMerge "wifi: hotspot2: add support for parsing Release 1 installation file"
Peter Qiu [Thu, 10 Nov 2016 20:19:51 +0000 (20:19 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file"
am: 44e817fdcf

Change-Id: If165cadffd0ae93fb94d1883f41851f1d92d50f6

7 years agoMerge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3 am...
Akira Oshimi [Thu, 10 Nov 2016 20:18:09 +0000 (20:18 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3 am: 08978cd0fd
am: 88ab92ce4c

Change-Id: I6abd73d3ce02dd33dc95c6132b1ff8aa4b13015c

7 years agoMerge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f
Jakub Pawlowski [Thu, 10 Nov 2016 20:14:24 +0000 (20:14 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f
am: c3cfff6ef6

Change-Id: Ia05bccadc06b202cf6ac1039b1e227bd67575bb5

7 years agoMerge "Start implementing background restrictions for eph apps."
Dianne Hackborn [Thu, 10 Nov 2016 20:14:09 +0000 (20:14 +0000)]
Merge "Start implementing background restrictions for eph apps."

7 years agoMerge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3
Akira Oshimi [Thu, 10 Nov 2016 20:12:34 +0000 (20:12 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3
am: 08978cd0fd

Change-Id: Ibd1b9ff4be577bf5ea5596342316ea2303d93b75

7 years agoAdd createForPhoneAccountHandle() and getServicetate()
Ta-wei Yen [Thu, 10 Nov 2016 20:11:56 +0000 (12:11 -0800)]
Add createForPhoneAccountHandle() and getServicetate()
Respect TelephonyManager's subId when listening to phone state

TelecomManager perfers to use a PhoneAccountHandle to represent a
account but TelephonyManager prefers subscription IDs.

This CL added createForPhoneAccountHandle() in TelephonyManager so
telephony values can be queried from it.

Currently the ServiceState can be retrieved through registering a
PhoneStatelistener, but it is a callback which the handler cannot be
specified.

getServiceState() is added to allow the ServiceState to be polled.

While TelphonyManager has createForSubscriptionId(), listen() does not
respect the subId on the manager created from it, and will always use
the hidden subId on the listener, which is always the default subId
through public API.

After this CL, the default subId on the listener will null.
TelephonyManager use its' own subId if the listener does not set the
subId to something else.

Bug: 32637799
Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: I9995e4da1573cf1f6b6e4acf2daf7a538fb60d5f

7 years agoMerge "BLE OOB Pairing - parse address type (5/5)"
Jakub Pawlowski [Thu, 10 Nov 2016 20:07:39 +0000 (20:07 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)"
am: 97d9fe0a2f

Change-Id: I935cc35d9f7f1eea5459f0091ad14dc8b200bc02

7 years agoMerge "Add null check before finish SystemUI Tuner's activity"
Akira Oshimi [Thu, 10 Nov 2016 20:06:34 +0000 (20:06 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity"
am: 5bb91bacc3

Change-Id: I0e9d19f297c158ff0c6acd1aa6665e3459fa416b

7 years agoMerge "wifi: hotspot2: add support for parsing Release 1 installation file"
Treehugger Robot [Thu, 10 Nov 2016 20:06:06 +0000 (20:06 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file"

7 years agoStart implementing background restrictions for eph apps.
Dianne Hackborn [Wed, 9 Nov 2016 23:07:23 +0000 (15:07 -0800)]
Start implementing background restrictions for eph apps.

This implements the additional intended path for checking
allowed background operations, APP_START_MODE_DISABLED, which
doesn't allow an app to launch in the background at all.

Also change the semantics of delivering broadcasts to manifest
receivers to always restrict those, not changing based on
whether the app is currently idle.  This is the desired intended
behavior for apps as they explicitly update to work with
bg check.

And now that we have ephemerality associated with the uid state
in the activity manager, we can propagate this through the
relevant callbacks in IUidObserver so things watching these
changes can immediately determine whether they should do their
more aggressive shut down work for the uid rather than having
to walk through all their state looking for package associated
with that uid and whether they should be shut down.

Also remove the "lenient" bg check mode, since that was
just an early experiment that we won't actually use.

Add a new "make-idle" activity manager command to immediately
put a uid into the idle state (if possible) to make it easier
to test.

Test: manually against an eph app
Change-Id: I43a138ff281f69a9251d3f29ab6e13f48cff8ad6

7 years agoMerge "BLE OOB Pairing - parse address type (5/5)"
Treehugger Robot [Thu, 10 Nov 2016 20:00:50 +0000 (20:00 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)"

7 years agoMerge "Add null check before finish SystemUI Tuner's activity"
Treehugger Robot [Thu, 10 Nov 2016 19:54:16 +0000 (19:54 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity"

7 years agoBLE OOB Pairing - parse address type (5/5)
Jakub Pawlowski [Thu, 10 Nov 2016 00:51:09 +0000 (16:51 -0800)]
BLE OOB Pairing - parse address type (5/5)

When address type is not parsed, creating bond to devices not using
random address is impossible.

Bug: 32780409
Test: try pairing with nRF52DK using random address
Change-Id: Ie6cc1f8c008d43b2acd021b47f9bbfb1f63472e8

7 years agoMerge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections...
Andreas Huber [Thu, 10 Nov 2016 19:33:38 +0000 (19:33 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am: df3d68c9b2 am: fbb980e57b am: fdaf348734
am: 90efd7bbb2

Change-Id: I66c2b632511ad5b6d2ce971ef4640e6c95c7c7b7

7 years agoMerge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections...
Andreas Huber [Thu, 10 Nov 2016 19:27:07 +0000 (19:27 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am: df3d68c9b2 am: fbb980e57b
am: fdaf348734

Change-Id: Icc30767adea1ce61fe3bd87b395268db674ce021

7 years agoMerge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections...
Andreas Huber [Thu, 10 Nov 2016 19:14:30 +0000 (19:14 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am: df3d68c9b2
am: fbb980e57b

Change-Id: I7b80bbe5eed3066edfe26d83dd322114d2e4a961

7 years agoMerge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
Andreas Huber [Thu, 10 Nov 2016 19:08:28 +0000 (19:08 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
am: df3d68c9b2

Change-Id: I56e293d16dee7503f717f3cca4902720307a2024

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 19:03:16 +0000 (19:03 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553  -s ours am: 0e11e0d961  -s ours am: 69246f0565  -s ours am: a8a116b001  -s ours am: 8409d50122  -s ours am: c07d8aa52d  -s ours am: e2dd105af2  -s ours
am: d3dd8e99fa  -s ours

Change-Id: I391dabf19257106be0464ad2fbae86ae464da7e0

7 years agoDO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508b...
Hugo Benichi [Thu, 10 Nov 2016 19:02:03 +0000 (19:02 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e  -s ours am: da695f5fdb  -s ours am: 69d565b12d  -s ours am: 37779485b7  -s ours am: 986c684fb0  -s ours am: 5c10f1e552  -s ours am: 8fe310892b  -s ours
am: 01d86c0902  -s ours

Change-Id: I2f2216c438756b0655d9183a98cee21cc642ec17

7 years agoMerge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
Treehugger Robot [Thu, 10 Nov 2016 18:58:28 +0000 (18:58 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 18:57:02 +0000 (18:57 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553  -s ours am: 0e11e0d961  -s ours am: 69246f0565  -s ours am: a8a116b001  -s ours am: 8409d50122  -s ours am: c07d8aa52d  -s ours
am: e2dd105af2  -s ours

Change-Id: Iab445b20d02e9a501d74f27a59da5047957efc13

7 years agoDO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508b...
Hugo Benichi [Thu, 10 Nov 2016 18:55:34 +0000 (18:55 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e  -s ours am: da695f5fdb  -s ours am: 69d565b12d  -s ours am: 37779485b7  -s ours am: 986c684fb0  -s ours am: 5c10f1e552  -s ours
am: 8fe310892b  -s ours

Change-Id: I63236413fa5272bbfb8c4fba83879089007694bc

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 18:50:28 +0000 (18:50 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553  -s ours am: 0e11e0d961  -s ours am: 69246f0565  -s ours am: a8a116b001  -s ours am: 8409d50122  -s ours
am: c07d8aa52d  -s ours

Change-Id: If5a7680ee9de27107bf32138e91f2eb705181ab0

7 years agoDO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508b...
Hugo Benichi [Thu, 10 Nov 2016 18:49:18 +0000 (18:49 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e  -s ours am: da695f5fdb  -s ours am: 69d565b12d  -s ours am: 37779485b7  -s ours am: 986c684fb0  -s ours
am: 5c10f1e552  -s ours

Change-Id: I9bf86e8adf3a2d6efbce54e3fc6a59ee650daaef

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 18:44:06 +0000 (18:44 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553  -s ours am: 0e11e0d961  -s ours am: 69246f0565  -s ours am: a8a116b001  -s ours
am: 8409d50122  -s ours

Change-Id: I31d22a167ee7de857ed0403b2d14daa1d90055f0

7 years agoDO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508b...
Hugo Benichi [Thu, 10 Nov 2016 18:42:57 +0000 (18:42 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e  -s ours am: da695f5fdb  -s ours am: 69d565b12d  -s ours am: 37779485b7  -s ours
am: 986c684fb0  -s ours

Change-Id: I5bb53669285c0878905f8a2a70ff2dbe06c09ab2

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 18:37:44 +0000 (18:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553  -s ours am: 0e11e0d961  -s ours am: 69246f0565  -s ours
am: a8a116b001  -s ours

Change-Id: I02d089dca4dd0ee9808f77dce0957b1cfaf6c87d

7 years agoDO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508b...
Hugo Benichi [Thu, 10 Nov 2016 18:36:30 +0000 (18:36 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e  -s ours am: da695f5fdb  -s ours am: 69d565b12d  -s ours
am: 37779485b7  -s ours

Change-Id: I42aabc35fa30e242125015eac1b7d32790cc4528

7 years agowifi: hotspot2: add Passpoint APIs to WifiManager
Peter Qiu [Tue, 25 Oct 2016 18:38:01 +0000 (11:38 -0700)]
wifi: hotspot2: add Passpoint APIs to WifiManager

Add dedicated APIs for managing Passpoint configurations, since
Passpoint configurations are different from WiFi network
configurations.  A Passpoint configuration provides a credential for
authenticating to one or more WiFi networks that are operated
by the "same" service provider.

Bug: 32282711
Test: make -j32

Change-Id: I52822ab3074e2f2a3d986e3c0a24d024f2c06dca

7 years agowifi: hotspot2: add support for parsing Release 1 installation file
Peter Qiu [Mon, 24 Oct 2016 16:59:43 +0000 (09:59 -0700)]
wifi: hotspot2: add support for parsing Release 1 installation file

Bug: 32277793
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I526c5e88e504c9c843d517a1a8208bc35d8655e9

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 18:25:11 +0000 (18:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553  -s ours am: 0e11e0d961  -s ours
am: 69246f0565  -s ours

Change-Id: I8181f07829ea7e77986a0f4537a61e4060c1176e

7 years agoDO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508b...
Hugo Benichi [Thu, 10 Nov 2016 18:23:58 +0000 (18:23 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e  -s ours am: da695f5fdb  -s ours
am: 69d565b12d  -s ours

Change-Id: Ibe074076d22a736394a01d27aa9e1c7ed73458b2

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 18:12:17 +0000 (18:12 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553  -s ours
am: 0e11e0d961  -s ours

Change-Id: I800746b8b1fc8e63eb78a83632d9eaac9abebcd2

7 years agoDO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508b...
Hugo Benichi [Thu, 10 Nov 2016 18:11:02 +0000 (18:11 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e  -s ours
am: da695f5fdb  -s ours

Change-Id: If1903ace2a31d8ccf3c66916211a07ac342fc360

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 18:04:28 +0000 (18:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
am: 06a55fb553  -s ours

Change-Id: I3e0facc6ff6dff0109452fe36f89a4eefe7676e1

7 years agoDO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
Hugo Benichi [Thu, 10 Nov 2016 18:04:26 +0000 (18:04 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
am: f88508bd3e  -s ours

Change-Id: I2ba3b591df623298f41e92e6f0d067a6fcf30533

7 years agoMerge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission...
Chris Elliott [Thu, 10 Nov 2016 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev

7 years agoAdding API for apps to specify their aspect ratio when entering PIP.
Winson Chung [Wed, 9 Nov 2016 00:15:10 +0000 (16:15 -0800)]
Adding API for apps to specify their aspect ratio when entering PIP.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testEnterPipAspectRatio
Test: #testEnterPipExtremeAspectRatios

Change-Id: I9efba942b9a6451dec07428fe1e428ef4a896867

7 years agoMerge "Wifi Tx/Rx rate computation" am: bccf93311c am: 33600a3d38 am: e929425a9e
Randy Pan [Thu, 10 Nov 2016 16:46:02 +0000 (16:46 +0000)]
Merge "Wifi Tx/Rx rate computation" am: bccf93311c am: 33600a3d38 am: e929425a9e
am: 6332104fbc

Change-Id: I10ae42879d7a4c7001583bfac2f835264c90ff2e

7 years agoUpdate testActivity
Jerome Gaillard [Mon, 7 Nov 2016 17:01:16 +0000 (17:01 +0000)]
Update testActivity

Put android:animateFirstView false in the test application theme
so that the date picker view displays fully.
Update the golden image to reflect the changes.

Change-Id: If57fac5c182dd69b4b4d4fcc30d6f17a8f67ad68
(cherry picked from commit 96970138fc1c8d928a6d3ec362865e6c626f56e4)

7 years agoMerge "Wifi Tx/Rx rate computation" am: bccf93311c am: 33600a3d38
Randy Pan [Thu, 10 Nov 2016 16:32:56 +0000 (16:32 +0000)]
Merge "Wifi Tx/Rx rate computation" am: bccf93311c am: 33600a3d38
am: e929425a9e

Change-Id: Ia38e00d785c56c295007aa19f3fe1e70d6a8b494

7 years agoMerge "Wifi Tx/Rx rate computation" am: bccf93311c
Randy Pan [Thu, 10 Nov 2016 16:26:23 +0000 (16:26 +0000)]
Merge "Wifi Tx/Rx rate computation" am: bccf93311c
am: 33600a3d38

Change-Id: I766decd0d68c9a2cb47d374c9a48c8eac59a6a67

7 years agoMerge "Wifi Tx/Rx rate computation"
Randy Pan [Thu, 10 Nov 2016 16:15:52 +0000 (16:15 +0000)]
Merge "Wifi Tx/Rx rate computation"
am: bccf93311c

Change-Id: I8b564af08155dcb49cf5f71d283b21091b80d3e0

7 years agoMerge "Wifi Tx/Rx rate computation"
Randy Pan [Thu, 10 Nov 2016 16:02:58 +0000 (16:02 +0000)]
Merge "Wifi Tx/Rx rate computation"

7 years agoMerge "2-D recents: fix toggling behavior and orientation changes."
Manu Cornet [Thu, 10 Nov 2016 15:20:55 +0000 (15:20 +0000)]
Merge "2-D recents: fix toggling behavior and orientation changes."

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: e231af6c88 -s ours am...
Bill Yi [Thu, 10 Nov 2016 14:51:59 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e231af6c88  -s ours am: 0006905319  -s ours
am: 35e837a2f5  -s ours

Change-Id: I1b90aa4d6ed49964237f93274b5be6e91ddb217f

7 years agoImport translations. DO NOT MERGE am: 377d4af0d0 -s ours am: 9d6ff72884 -s ours
Bill Yi [Thu, 10 Nov 2016 14:50:57 +0000 (14:50 +0000)]
Import translations. DO NOT MERGE am: 377d4af0d0  -s ours am: 9d6ff72884  -s ours
am: 96fba02eea  -s ours

Change-Id: I22dd965ff4382972860a30f9435a0b1d8f296379

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 0bf8ae56ff -s ours am...
Bill Yi [Thu, 10 Nov 2016 14:49:51 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0bf8ae56ff  -s ours am: 221c05e6d1  -s ours
am: f9c19c2022  -s ours

Change-Id: I34bf096bd09cc4dfc463e00c70791392da17f6fc

7 years agoImport translations. DO NOT MERGE am: 37fa5cbc28 -s ours am: 35b2ed41ce -s ours
Bill Yi [Thu, 10 Nov 2016 14:48:47 +0000 (14:48 +0000)]
Import translations. DO NOT MERGE am: 37fa5cbc28  -s ours am: 35b2ed41ce  -s ours
am: dca4571f89  -s ours

Change-Id: I00c6e2ac628975709220a4ab5c43dcc9f343568b

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: e231af6c88 -s ours
Bill Yi [Thu, 10 Nov 2016 14:43:49 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e231af6c88  -s ours
am: 0006905319  -s ours

Change-Id: Ibdf03fc0e8582ef252ee5c922b206685de2b9829

7 years agoImport translations. DO NOT MERGE am: 377d4af0d0 -s ours
Bill Yi [Thu, 10 Nov 2016 14:42:49 +0000 (14:42 +0000)]
Import translations. DO NOT MERGE am: 377d4af0d0  -s ours
am: 9d6ff72884  -s ours

Change-Id: I89064de048418230fb51e09ceb3d6bfd631101c1

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 0bf8ae56ff -s ours
Bill Yi [Thu, 10 Nov 2016 14:41:42 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0bf8ae56ff  -s ours
am: 221c05e6d1  -s ours

Change-Id: I15d5908cbf02847651321cea840c10666aa1c245

7 years agoImport translations. DO NOT MERGE am: 37fa5cbc28 -s ours
Bill Yi [Thu, 10 Nov 2016 14:37:50 +0000 (14:37 +0000)]
Import translations. DO NOT MERGE am: 37fa5cbc28  -s ours
am: 35b2ed41ce  -s ours

Change-Id: Ibc2fa8caa377cdf5433842929549359ce8e4b71b

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 10 Nov 2016 14:25:20 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: e231af6c88  -s ours

Change-Id: I85b530c1946c4d2da5a4fefb6b343edb75b57697