Commit Graph

222703 Commits

Author SHA1 Message Date
Sergio Giro
e38bdf6bf7 ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Needed by AbstractVerifier, needed by framework/base

DistinguishedNameParser taken from libcore, commit a5c16db453098d7ab945edd379a

This commit was adapted from commit 50dc0c27ff00bfd82fb9cce1c86312efa550170f

Not cherrypicking from dev branch as the original CL to do it went wrong
and would need to cherrypick more changes

Change-Id: I1c282b731c778a79775d9d54b7b7d7223d84397d
2015-11-25 15:25:29 +00:00
Michael Wright
1c8e95167b Merge "Add new TestApi annotation." 2015-11-25 14:12:22 +00:00
Geoff Mendal
87c6aefba5 Merge "Import translations. DO NOT MERGE" 2015-11-25 13:50:24 +00:00
Geoff Mendal
2dac6ccaa6 Import translations. DO NOT MERGE
Change-Id: Iec73269d9960af59bddd9ed0189fea144526850c
Auto-generated-cl: translation import
2015-11-25 05:48:34 -08:00
Geoff Mendal
92eda4fd29 Merge "Import translations. DO NOT MERGE" 2015-11-25 13:37:42 +00:00
Geoff Mendal
0634fbb334 Import translations. DO NOT MERGE
Change-Id: I8ab271a3bfdd0b4d4917cc21234b70b79063e3cf
Auto-generated-cl: translation import
2015-11-25 05:37:11 -08:00
Geoff Mendal
cb37f2566e Import translations. DO NOT MERGE
Change-Id: Iede8cc7c1f459d1f3506dce88dc435c7b5f85ee7
Auto-generated-cl: translation import
2015-11-25 05:18:41 -08:00
Michael Wright
b2b2c0e7d0 Add new TestApi annotation.
This allows us to build a special jar with methods exposed strictly
for CTS. An @TestApi should not be a public API or a system
API.

Bug: 25608286

Change-Id: Ifbc64bb6958d2deec5b9cf0b944acfd068f0f051
2015-11-25 13:01:03 +00:00
Neil Fuller
7ff6e9e7e8 Merge "Add ICU4J APIs for Android" 2015-11-25 09:38:08 +00:00
Lorenzo Colitti
2a2f855c4d Merge "Make the new NetworkRequest flavour consistent with the others." 2015-11-25 07:46:31 +00:00
Keisuke Kuroyanagi
877a4e09ea Merge "Selection Test: selection handle snaps to word boundaries." 2015-11-25 07:37:29 +00:00
Keisuke Kuroyanagi
68e1945c39 Merge "Selection Test: selection handle doesn't pass anther one." 2015-11-25 07:37:10 +00:00
Keisuke Kuroyanagi
e85a2687ae Merge "Add selection handle multiline dragging tests." 2015-11-25 07:31:37 +00:00
Keisuke Kuroyanagi
d3c48931ea Merge "Add selection handle dragging tests." 2015-11-25 07:24:17 +00:00
Keisuke Kuroyanagi
ec913c0eb6 Selection Test: selection handle snaps to word boundaries.
Bug: 25730231

Change-Id: I12d3fde4ff5b52aa6673de915c53b6a5f72f4b35
2015-11-25 16:15:20 +09:00
Keisuke Kuroyanagi
cb6e8420cb Selection Test: selection handle doesn't pass anther one.
Bug: 25730231
Change-Id: Ibca75126a0b2d4320d1f67dc35a2b0ac20fcdcd2
2015-11-25 16:15:20 +09:00
Keisuke Kuroyanagi
c24c2bbb69 Add selection handle multiline dragging tests.
Bug: 25730231

Change-Id: I23b9e35d7a5ea8d03d8634ffca0e186ea76ebc99
2015-11-25 16:15:19 +09:00
Keisuke Kuroyanagi
da79ee683d Add selection handle dragging tests.
- Set an id for each HandleView to access the hanlde.
- Rename DragOnTextViewActions to DragAction to use it for
dragging handles.
- Introduce HandleCoordinates to provide proper coordinates
for handles.

More tests will be added in following CLs.

Bug: 25730231
Change-Id: I9276bf2f983983ec9aae0ddcf674d3dcee566892
2015-11-25 16:15:15 +09:00
Lorenzo Colitti
d117946299 Make the new NetworkRequest flavour consistent with the others.
Change-Id: I491eb0b6d2fa0f1c472c97ef403488407e71803e
2015-11-25 15:47:14 +09:00
Lorenzo Colitti
7754abb2fc Merge "Temporarily add a requestNetwork flavour that takes a legacy type" 2015-11-25 06:37:25 +00:00
Lorenzo Colitti
c415f72b66 Merge changes I456984a2,Id4d1031b
* changes:
  Switch the DHCP client to the new AlarmManager callback interface
  Refactor alarm setting code in preparation for switch to callback
2015-11-25 04:37:59 +00:00
Seigo Nonaka
4a45d5b7df Merge "Make suggestion window style material." 2015-11-25 03:24:41 +00:00
Lorenzo Colitti
7de289f355 Temporarily add a requestNetwork flavour that takes a legacy type
This method is public @hide to support progressive refactoring of
tethering away from startUsingNetworkFeature to requestNetwork,
without getting in the way of the CONNECTIVITY_ACTION cleanup in
b/22513439 .

Bug: 9580643
Bug: 22513439
Change-Id: I9053ec746cc8f415a2d5849f044667eeb14e1b19
2015-11-25 12:00:52 +09:00
Winson
7afe8c9002 Fixing two small regressions in stack layout.
- Fixed issue with max scroll position being placed beyond the max
  scroll if the task height is larger than the stack height.
- Fixed issue with single task offsets being calculated incorrectly

Change-Id: I3cb1ecf2c13de7196bd68cd4f9d9f4f4736ed3ce
2015-11-25 01:59:00 +00:00
Jorim Jaggi
54fdfaa3b5 Merge "Crash when exception in event bus handler happens" 2015-11-25 01:52:48 +00:00
Jorim Jaggi
ba54881231 Merge "Allow stacks to be placed outside of display" 2015-11-25 01:49:50 +00:00
Jorim Jaggi
54b1a6deeb Crash when exception in event bus handler happens
Also fixes another crash when dragging in recents.

Change-Id: I24eff235adc63190369a7e054e65c55fdf594931
2015-11-24 17:48:26 -08:00
Chong Zhang
b15758ab7a Support scrolling for non-resizeable tasks in side-by-side mode
Display toast when a non-resizeable task is put into side-by-side mode.

Scroll the task upon a two-finger scroll gesture.

bug: 25433902

Change-Id: I69967056a564cfe7773afb80aa7e7ea7167a791a
2015-11-24 17:38:33 -08:00
Jorim Jaggi
2fbe033f9d Allow stacks to be placed outside of display
When dismissing the docked stack, we animate the divider to position
-12dp, so the full-screen stack is exactly full-screen when the dismiss
animation is done. Previously, this was prevented by window manager.
Allow it to fix the animation.

Change-Id: Iee4505023dc3f6907d56851965b156235f9f97f2
2015-11-24 17:37:03 -08:00
Filip Gruszczynski
786e12d92f Merge "Destroy docked divider surface when it's hidden." 2015-11-25 01:10:59 +00:00
Jorim Jaggi
bd7cafa6da Merge "Don't trigger click if long press already happened" 2015-11-25 00:55:44 +00:00
Filip Gruszczynski
cb5f57bc58 Destroy docked divider surface when it's hidden.
Also includes bunch of small refactorings:
* destroying surfaces is now fully contained within
WindowManagerServices and mDestroySurface can be privatized;
* WMS.isDockedStackResizingLocked can be removed;
* mScreenCaptureDisabled changes from being SparseArray<Boolean> to
SparseBooleanArray, which not only avoids boxing but also makes code
simpler (no need to check for null)

Bug: 25844096
Change-Id: I0e5462760ffbc947ce6dc52ef429fa270ffc6786
2015-11-24 16:48:26 -08:00
Makoto Onuki
21942b2240 Merge "DA receiver should be protected with BIND_DEVICE_ADMIN." 2015-11-25 00:30:41 +00:00
Makoto Onuki
3ab6f2e219 DA receiver should be protected with BIND_DEVICE_ADMIN.
- DPM.setActiveAdmin() will not accept DAs without BIND_DEVICE_ADMIN
when it's targeting NYC or above.

- DAs without BIND_DEVICE_ADMIN targeting MNC or below will still be
accepted. (with a logcat warning)

- DAs that are already set on a device without BIND_DEVICE_ADMIN
will still be accepted regardless of the target API level, even when
it's upgraded to a version targeting NYC.

Bug 24168653

Change-Id: I1914c2ec99135d9dd8cbac3f6914f9e43bafacc8
2015-11-24 16:14:21 -08:00
Jorim Jaggi
053f21864a Don't trigger click if long press already happened
So when long pressing recents, we don't dimiss recents
immediately again.

Change-Id: I8092cceb03bd6786b964390f7a3a93686feb1b75
2015-11-24 16:10:33 -08:00
Tyler Gunn
a3e0072504 Merge "Add "acceptRingingCall()" API which accepts a videoState." 2015-11-25 00:04:13 +00:00
Makoto Onuki
774d866935 Merge "Add DO API to get wifi mac address" 2015-11-24 23:53:35 +00:00
Tyler Gunn
6676bb5da5 Add "acceptRingingCall()" API which accepts a videoState.
- Added acceptRingingCall API which accepts a videostate to complement the
existing API.

Bug: 20159300
Change-Id: I2a9d53fd4dbbb0be49d95416f7e26d3ec61774cd
2015-11-24 15:43:20 -08:00
Makoto Onuki
a31ebbc439 Add DO API to get wifi mac address
Bug 25496044

Change-Id: Ib1f0ce4ca10951edcfaa0aa79ae5c2d142a74599
2015-11-24 15:38:16 -08:00
Amit Mahajan
d13fb587b9 Merge "Make some static functions public so telephony tests can access them" 2015-11-24 23:34:11 +00:00
Jorim Jaggi
d79a245ac2 Merge "Reload tasks when doing drag gesture" 2015-11-24 23:22:52 +00:00
Jorim Jaggi
b0cab35c18 Merge changes Ieb3c8c73,If494fddf,Ia9415fa6
* changes:
  Add ability to supply initial bounds when docking task
  Make sure to clear pending spec
  Clear spec future when clearing transition
2015-11-24 23:11:34 +00:00
Jorim Jaggi
435b2e43cb Reload tasks when doing drag gesture
To make sure we always have the updated stack id's
for the task.

Change-Id: I8bfda33aa26b470cb5f087cee9e8e8560c0e3ba2
2015-11-24 15:09:30 -08:00
Jorim Jaggi
9ea2f7ba31 Add ability to supply initial bounds when docking task
Add an optional parameter in moveTaskToDockedStack to supply an
initial rect to be used when creating the dockeds tack. Pass in
the adjusted rect when dragging up from the navbar so it doesn't
flicker anymore.

Change-Id: Ieb3c8c73b9e2a769a2ec6270bd76a713201a2aed
2015-11-24 15:08:49 -08:00
Makoto Onuki
05d0d44034 Merge "DPM.isDeviceOwnerApp() and getDeviceOwner() now check calling user" 2015-11-24 23:03:46 +00:00
Makoto Onuki
c8a5a555f1 DPM.isDeviceOwnerApp() and getDeviceOwner() now check calling user
- Previously on MNC, they would return the same result regardless who
the calling user is.

- Now they properly take DO user-id into account.  Meaning, they'll
always return false and null respectively, if the calling user doesn't
run device owner.

- Note isDeviceOwnerApp() is a public API and getDeviceOwner() is
a system API.  Meaning we're changing the behavior or non-private
APIs.

- Also cleaned up hidden APIs, and gave them explicit suffixes
to avoid confusion.  Bundled code should prefer them for clarity.

Now we have:

* APIs that work cross-users: They all require MANAGE_USERS.
boolean isDeviceOwnerAppOnAnyUser(String packageName)
ComponentName getDeviceOwnerComponentOnAnyUser()

int getDeviceOwnerUserId()
boolean isDeviceOwnedByDeviceOwner()

String getDeviceOwnerNameOnAnyUser()

* APIs that work within user.  No permissions are required.

boolean isDeviceOwnerAppOnCallingUser(String packageName)
ComponentName getDeviceOwnerComponentOnCallingUser()

Bug 24676413

Change-Id: I751a907c7aaf7b019335d67065d183236effaa80
2015-11-24 14:54:48 -08:00
Jorim Jaggi
c4d49cd684 Make sure to clear pending spec
So when it gets out of sync it only fails once

Change-Id: If494fddfcbcb0145e2db1caa3b7612d8452c70d4
2015-11-24 13:48:26 -08:00
Philip P. Moltmann
c9137615e4 Merge changes from topic 'AddPrinters'
* changes:
  Create PrintDiscoverySession for future print services
  Update printer availability when printSpooler is paused. This makes the window update syncronously when in multi-window mode.
2015-11-24 21:33:39 +00:00
Jorim Jaggi
65193999da Clear spec future when clearing transition
Sometimes I still see an old recents animation when the transition
failed before. I believe this is because we don't clear the future
when clearing the transition.

Change-Id: Ia9415fa68c8e472c15fabccaf788762186d2d35e
2015-11-24 13:12:58 -08:00
Svetoslav Ganov
abef6d6f2b Merge "Allow fragment state loss on fragment transaction" 2015-11-24 20:56:22 +00:00