Commit Graph

48855 Commits

Author SHA1 Message Date
George Mount
d9f3aa58d7 Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev 2015-06-25 20:55:37 +00:00
Alan Viverette
e71c6e3832 Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev 2015-06-25 20:00:56 +00:00
Alan Viverette
ba4332d9cf Constrain ListPopupWindow hint width spec to >= 0
Bug: 22092169
Change-Id: Ia05302cf8d167aae26eccbf53dd3fd21d09b326d
2015-06-25 13:00:03 -07:00
Alan Viverette
fdf102e62d Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev 2015-06-25 19:57:03 +00:00
Yohei Yukawa
ab142f7f57 Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev 2015-06-25 19:39:36 +00:00
Alan Viverette
39fd902bdb Constrain child width and height to >= 0 in FrameLayout.onMeasure()
Bug: 22093669
Change-Id: I55e8a0289f871b73ed07f3d73e8297786f9acac1
2015-06-25 12:24:27 -07:00
Svetoslav
263b6e6983 Merge "Prevent certain actions of app has revoked permissions" into mnc-dev 2015-06-25 18:20:16 +00:00
Jun Mukai
46f087c43b Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev 2015-06-25 18:16:57 +00:00
Svetoslav
7008b51817 Prevent certain actions of app has revoked permissions
bug:21808294

Change-Id: I7214c1fe47c15fe185423a54a74b58caf8d82daa
2015-06-25 10:55:11 -07:00
Alan Viverette
efb49bd811 Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev 2015-06-25 17:08:42 +00:00
Alan Viverette
de14ad55f6 Constrain width and height to >= 0 in FastScroller layout
Bug: 22071990
Change-Id: I9dcb2066ee069a3764b7d711cb341a4dfdc4445e
2015-06-25 09:57:30 -07:00
Mady Mellor
d4d802be39 Merge "Fix: Don't display the drag handles when focus is lost" into mnc-dev 2015-06-25 15:54:03 +00:00
Andrei Stingaceanu
3d7109a1f6 Merge "EditText - can not drag handles in extracted mode" into mnc-dev 2015-06-25 15:52:51 +00:00
Mady Mellor
a2861454aa Fix: Don't display the drag handles when focus is lost
The text selection handles should be hidden / shown when the window
loses / regains focus.

Additionally renames method to make more sense.

Bug: 22062480
Change-Id: I6e160234cf112ee285367637e2f1c14defd82e89
2015-06-25 08:40:27 -07:00
Alex Klyubin
c781405f43 Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev 2015-06-25 15:07:28 +00:00
Alex Klyubin
6223b7e911 Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev 2015-06-25 15:06:49 +00:00
Andrei Stingaceanu
1cb1f1523a EditText - can not drag handles in extracted mode
In TextView's onPreDraw method, startSelectionActionMode()
is called, but the selection has already been started so
in startSelectionActionMode() it shows the
insertionController which hides the selectionController.
Fix this by adding a check to start the action mode only
if it is not already started.

Bug: 22028858
Change-Id: I2999423155b7a63a7d879bc8ea5032e17dff459f
2015-06-25 11:54:43 +01:00
Jun Mukai
9fb302cfbc Apply thumbTint and trackTint styles to Switch from xml.
Bug: 21664957
Change-Id: Id08ae89fb1586968df4b901816a8e108bb8570af
2015-06-24 18:31:06 -07:00
Dave Langemak
ecff75a158 Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev 2015-06-25 01:18:00 +00:00
Dave Langemak
afaed06cda Revert "Throw IAE on invalid measure spec size"
This reverts commit ac6cfb32fe.

Change-Id: Ie60b48eac5f732071a5039b9b6bc7b18eb694d5b
2015-06-25 01:14:26 +00:00
Alan Viverette
10bf27e2c9 Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 2015-06-25 00:09:06 +00:00
Alan Viverette
39310d3606 Avoid negative childSpecSize in RelativeLayout
Bug: 22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
2015-06-24 17:03:48 -07:00
Alex Klyubin
8effa36ca6 Use standard copyright banner in android/security/keymaster.
Bug: 18088752
Change-Id: I22eec18130cc46222d50481164069e7714154979
2015-06-24 16:06:55 -07:00
Alex Klyubin
3e7a9e4ec6 Track rename of INT and LONG Keymaster tag types.
Bug: 22008538
Change-Id: Id0091e59738c828a96305edbfc4f3958e712278b
2015-06-24 15:46:45 -07:00
Chris Wren
749d66b82f Merge "remove setLatestEventInfo" into mnc-dev 2015-06-24 22:17:45 +00:00
Adam Lesinski
b21a77fefc Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 2015-06-24 21:32:38 +00:00
Adam Lesinski
c30454c104 Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
Bug:22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
2015-06-24 13:35:46 -07:00
Christopher Tate
413020a6ca Require that verified intent filters only have http/https <data> decls
It is malformed to write a single intent filter like this:

  <intent-filter android:autoVerify="true">
    <data android:host="foo.example"
          android:path="/"
          android:scheme="http" />
    <data android:host="*"
          android:path="/custom"
          android:scheme="fooexamplecustomscheme" />
  </intent-filter>

In practice this app is accidentally defining a filter that will match
"http://*".  This is now detected, and will never be auto-verified for
any of the mentioned domains.

Verified intent filters must *only* handle the http & https schemes.

Bug 21920537

Change-Id: I933cddbea23185d242565cac940e1e7a7e4e289b
2015-06-24 13:16:20 -07:00
Alex Klyubin
d4e9e0e1d6 Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 2015-06-24 20:03:10 +00:00
Chris Wren
a05db3816b remove setLatestEventInfo
This has been deprecated since API 11.

Bug: 18510449
Change-Id: Ibd052572aa8c332daf5f6a604afe1925e8998a2b
2015-06-24 15:18:34 -04:00
Alan Viverette
9bf9a3a99e Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 2015-06-24 18:22:33 +00:00
Alan Viverette
c98922ba2f Constrain FastScroller max width to be >= 0
Bug: 22055552
Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9
2015-06-24 10:22:02 -07:00
Esteban Talavera
e4ffec210e Merge "Reset permission policy to default when device owner goes away" into mnc-dev 2015-06-24 16:42:36 +00:00
Esteban Talavera
28b9570d02 Reset permission policy to default when device owner goes away
Otherwise after the Device Owner is gone, runtime
permissions might still be auto granted/denied.
I understand that there are many other policies that
we don't reset after the device/profile owner goes
away (e.g. keyguard enabled/disabled). At least now
we have a single method when we could clear the
ones that we care about.

Bug: 21889278
Change-Id: I6997655e6ef6d474bd25ae1c323eca5b17944b16
2015-06-24 17:19:19 +01:00
Michael Wright
5edd0e06d5 Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 2015-06-24 16:12:22 +00:00
Andrei Stingaceanu
2e5615467e Merge "Floating toolbar shown after rotation in extract mode" into mnc-dev 2015-06-24 09:16:36 +00:00
Yohei Yukawa
38940aab69 Handle back key to cancel text action mode in full-screen IME.
This CL is a follow up to I7998c8ee2162a0e01525a0cd66ec14fa505,
which completely removed ExtractActionMode including back key
handling in InputMethodService when full-screen mode is enabled.

It turns out that back key events still need to be handled in
InputMethodService when full-screen mode is enabled so that
users can still cancel floating text action mode with back key.

Bug: 22034992
Change-Id: I5f8db34f7425eef343d40d9820925ea6aaf9fccc
2015-06-24 00:20:24 -07:00
Daniel Sandler
0ec462005d Fix build.
We don't need purgeResources public since it's part of the
ashmem internal optimization.

Change-Id: I65ba7545cf4801a8b97f3ece9b5ee5100c0f1c97
2015-06-24 01:27:05 -04:00
Alex Klyubin
ae6cb7aad5 Keymaster INT, LONG and DATE tag values are unsigned.
This CL ensures that Android Keystore framework code complies with
signedness of keymaster tags. In particular:
* INT tags are unsigned 32-bit numbers, and
* LONG and DATE tags are unsigned 64-bit numbers.

The ensure compliance, KeymasterArguments and KeyCharacteristics
classes through which Android Keystore interacts with Keymaster tags
have been modified as follows:
* ENUM and INT tags which used to be conflated are now added/queried
  via separate methods, because ENUM can remain represented as an int
  data type whereas INT is now represented as a long data type with
  permitted range being [0; 2^32).
* Methods for adding/quering LONG tags have been switched from the long
  data type to the BigInteger data type and now ensure that the value
  is in the permitted [0; 2^63).
* Methods for adding/querying DATE tags now ensure the Date value is
  in the permitted range [0; 2^63) ms since Unix epoch.
* Methods for adding tags throw an IllegalArgumentException if the tag
  type is unsuitable for the method. This is to ensure that tags with
  invalid values cannot be added through similar methods (e.g., INT tag
  added via an ENUM tag addition method invoked with a negative value).

Bug: 22008538
Change-Id: I6eefd5cbb561cc52d27de952691af4d9d5e1af1e
2015-06-23 20:04:28 -07:00
Daniel Sandler
25a5f30128 Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 2015-06-24 02:09:58 +00:00
Simranjit Singh Kohli
29124960c6 Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev 2015-06-24 01:24:45 +00:00
Alan Viverette
b1825feac0 Merge "Throw IAE on invalid measure spec size" into mnc-dev 2015-06-23 23:41:03 +00:00
Dianne Hackborn
fcaed60650 Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 23:34:22 +00:00
Ruben Brunk
a39fcc5875 Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 2015-06-23 23:33:22 +00:00
Alan Viverette
ac6cfb32fe Throw IAE on invalid measure spec size
Crash immediately so that we can track down the cause. If we let it
through, we'll hit an ISE later in dispatchVsync() and never know why.

Bug: 21948478
Change-Id: I84edf93cdf09d755419e18a7606b7b6cbd059956
2015-06-23 16:23:49 -07:00
Ruben Brunk
b8f4c6ab1e Update DngCreator to handle pre-correction dimens.
Bug: 20491394
Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
2015-06-23 16:23:03 -07:00
Svetoslav Ganov
2c99ea3524 Merge "Remove not needed contacts related permissions." into mnc-dev 2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions.
This reverts commit ed5ff51b2c.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
2015-06-23 23:03:55 +00:00
George Mount
5697c323a5 Fix removeTarget to remove by ID instead of index.
Bug 22043875

Change-Id: I47933343381df7c46580279a864ab03d44c992ec
2015-06-23 15:42:37 -07:00
Zach Johnson
08a244cee8 Update CarrierService long lived binding API
Should take a metadata approach instead of a separate
intent.

b/21080696

Change-Id: Ib6e2ec0d3258e419aa14ae9e598a8147505feb84
2015-06-23 14:31:13 -07:00