Commit Graph

42671 Commits

Author SHA1 Message Date
Jeff Sharkey
bea6648df5 am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit 'a2781fdac332c4f6277a986c88e34daa25a3b5f9':
  Recover apps with malformed certificates.
2014-11-12 23:50:47 +00:00
George Mount
a6d33fd7ba am 3ba2c7c6: am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev
* commit '3ba2c7c681f3bf355cef1c6e32a6fdf315865f57':
  Fix getChildVisibleRect to clip correctly.
2014-11-12 23:49:40 +00:00
Ignacio Solla
4fc66e582a am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev
* commit 'ba1d4cd4fe65e60ba3eaef9cfbe93cb99424ef47':
  Fix docs build breakage
2014-11-12 23:49:31 +00:00
Dianne Hackborn
7437ec8e1d am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count.
* commit 'caf3cddd5bff11a20e72e7df54b826e33d2fe6a9':
  Add reporting of Parcel memory/count.
2014-11-12 23:49:25 +00:00
Rob Tsuk
6552afa878 am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev
* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
  Add a way to override Xfermode DO NOT MERGE
2014-11-12 23:49:19 +00:00
Ignacio Solla
fd003c707e am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev
* commit 'dfb25b3dec64fb9537d5f34771b7f4a1812925b9':
  [WebView] Interface to access hidden APIs.
2014-11-12 23:49:13 +00:00
Sandeep Siddhartha
41dc467957 am 5f02d295: Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev automerge: 850ec91
* commit '5f02d29550588a17add0b83f7e7bfcd324f20778':
  Don't unload the sound model on stopRecognition
2014-11-12 23:39:50 +00:00
Jeff Sharkey
a2781fdac3 am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit '521ca5f8fba355f526e82dc3a8fc6520e4379874':
  Recover apps with malformed certificates.
2014-11-12 22:54:47 +00:00
George Mount
3ba2c7c681 am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev
* commit '70cb4f3e7131cda1e58c1f6d422e296c4935289d':
  Fix getChildVisibleRect to clip correctly.
2014-11-12 22:46:08 +00:00
Ignacio Solla
ba1d4cd4fe am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev
* commit 'c3631b985f51fcce97b0111cdd8297a58c44a5ec':
  Fix docs build breakage
2014-11-12 22:41:56 +00:00
Dianne Hackborn
caf3cddd5b am fabb70b2: Add reporting of Parcel memory/count.
* commit 'fabb70b2efbd125f74923d19ab12bc8e1371ed1f':
  Add reporting of Parcel memory/count.
2014-11-12 22:41:51 +00:00
Rob Tsuk
ccc956b2b4 am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev
* commit '41a8043b30a289bdba55a2469e598b3fe67c3bf1':
  Add a way to override Xfermode DO NOT MERGE
2014-11-12 22:36:18 +00:00
Ignacio Solla
dfb25b3dec am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev
* commit '10ece9c9d5c2134a6ea04bf593a2b76d167dbd7a':
  [WebView] Interface to access hidden APIs.
2014-11-12 22:36:09 +00:00
Jeff Sharkey
521ca5f8fb am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit '2e7000040e3d836bb591e29515974817afc49488':
  Recover apps with malformed certificates.
2014-11-12 22:24:24 +00:00
Jeff Sharkey
2e7000040e am d68b87cd: Recover apps with malformed certificates.
* commit 'd68b87cdd402d46013170d9316a31c82be4e4816':
  Recover apps with malformed certificates.
2014-11-12 22:20:46 +00:00
George Mount
70cb4f3e71 Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 2014-11-12 22:11:45 +00:00
Ignacio Solla
c3631b985f Merge "Fix docs build breakage" into lmp-mr1-dev 2014-11-12 21:58:46 +00:00
Dianne Hackborn
fabb70b2ef Add reporting of Parcel memory/count.
Also fix issue #18340771: Dumpsys Procstats missing a newline

Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
2014-11-12 21:56:30 +00:00
Ignacio Solla
53f2569487 Fix docs build breakage
Change-Id: Id20a54d8da2b80f277e31c342fffbb3b7d0dc854
2014-11-12 21:55:47 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00
Sandeep Siddhartha
5f02d29550 Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev
automerge: 850ec91

* commit '850ec91e88c2b0911f8460f909eabf4078b78582':
  Don't unload the sound model on stopRecognition
2014-11-12 21:17:53 +00:00
Ignacio Solla
10ece9c9d5 Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 2014-11-12 21:17:07 +00:00
Jeff Sharkey
d68b87cdd4 Recover apps with malformed certificates.
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle.  The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
2014-11-12 13:16:06 -08:00
Rob Tsuk
4678dcc552 Add a way to override Xfermode DO NOT MERGE
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
2014-11-12 12:25:24 -08:00
Sandeep Siddhartha
45c00b5877 Don't unload the sound model on stopRecognition
This helps us in majority of the scenarios where the sound model doesn't
change across start/stop calls.

Bug: 17954633
Change-Id: Ibff817bb69bc69d2bb3a2603460fed596688b892
2014-11-12 09:57:27 -08:00
Alan Viverette
0dea93c0ca am c164b97f: am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
* commit 'c164b97f465813e8ef7b52378d48b5af80abb4fa':
  Ensure time picker dialog fits on small screens
2014-11-12 17:40:23 +00:00
Alan Viverette
c164b97f46 am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
* commit '4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea':
  Ensure time picker dialog fits on small screens
2014-11-12 17:35:58 +00:00
Alan Viverette
4fc2ea8402 Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 2014-11-12 17:32:31 +00:00
Alan Viverette
d9f3fdf45b Ensure time picker dialog fits on small screens
Also fixes dialog padding in landscape mode and a bug in the
ColorStateList method used to apply a selected color.

BUG: 18251582
Change-Id: Id5b8c7893ec42fd4d5f4a7520e6ac170839d3143
2014-11-12 09:31:22 -08:00
Wale Ogunwale
3ae0d3157d Fixed constant window switching on lock screen with Swype KB.
We allow TYPE_INPUT_METHOD windows to show on the lock screen.
These windows can attached other types of windows (For this
case the Swype KB was attaching a PopupWinow which will be
of TYPE_APPLICATION). This causes the popup window app token
to be added to the list of apps to be hidden on the lock
screen, thereby preventing the lock screen from been hidden,
which then causes a layout cycle(s). Now, we remove app
tokens for non-app windows from the hidden list in case it
was added by any attached widow they migth have.

Also, when we are updating window animations, set the
hideWhenLocked flag for windows that are IME tragets so
they don't go through unneeded cycles of having their
visibility policy set to hide/show/hide/show/...

Bug: 18021493
Change-Id: I3680256d41793f62def42fda00e26db1dcc990cc
2014-11-12 08:42:09 -08:00
George Mount
002d43d29b Fix getChildVisibleRect to clip correctly.
Bug 18292516

getClipVisibleRect now takes into account clipChildren,
clipBounds, and clipToPadding.

Change-Id: I181cd68354e70767868e9edd56bf82a58357391d
2014-11-12 08:04:34 -08:00
George Mount
fda5336c2f am 57837b9f: am 13b27810: Merge "Remove unnecessary reflection lookup in Animators." into lmp-mr1-dev
* commit '57837b9fc6ce81d476393684172d1e3ce8271cf0':
  Remove unnecessary reflection lookup in Animators.
2014-11-12 15:49:39 +00:00
George Mount
13b27810f9 Merge "Remove unnecessary reflection lookup in Animators." into lmp-mr1-dev 2014-11-12 15:42:21 +00:00
Narayan Kamath
3a35bf3f9c am 72f9838c: am 222722ee: Merge "Tell installd when boot completes." into lmp-mr1-dev
* commit '72f9838c99a9cb8d84b8ec4af5372f10eeeb4e94':
  Tell installd when boot completes.
2014-11-12 12:55:29 +00:00
Narayan Kamath
222722ee73 Merge "Tell installd when boot completes." into lmp-mr1-dev 2014-11-12 12:48:22 +00:00
Amith Yamasani
e73cab5f12 Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev automerge: 93ffd5d
automerge: 15de62d

* commit '15de62de26a3ef936a219daf65ec5d388197a9fc':
  Allow profile owners to set the unknown source setting
2014-11-12 03:13:59 +00:00
Junda Liu
829519dfaa Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f
automerge: 5716ebe

* commit '5716ebe50debab01ede01b2f99abde85a250c82c':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
2014-11-12 03:12:51 +00:00
Jeff Brown
a473878158 am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
automerge: c1275e7

* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
  Move device admin max screen off timeout to internal interface.
2014-11-12 00:24:43 +00:00
Amith Yamasani
93ffd5dc0a Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev 2014-11-12 00:07:59 +00:00
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Amith Yamasani
52c39a16db Allow profile owners to set the unknown source setting
This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.

Bug: 18316350

Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
2014-11-11 23:38:24 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
George Mount
691487d2c3 Remove unnecessary reflection lookup in Animators.
Bug 17978210

When Properties are used with PropertyValuesHolders or
ObjectAnimators, the reflection lookup for getters and
setters is unnecessary.

Fixed problem in which static maps were being protected
by instance locks.

Fixed problem where we were repeatedly doing a
reflection lookup on methods that don't exist.

Change-Id: Ic0a1b62357f3aaaa4c900fef6087583ad0e964b6
2014-11-11 08:51:53 -08:00
George Mount
341df46488 am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev
* commit 'c07b6295c6fefe845ae15e2adad7aebb2280b1ab':
  Make setOutlineProvider change transitionGroup.
2014-11-11 15:48:52 +00:00
George Mount
12403b242f Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 2014-11-11 15:41:33 +00:00
Narayan Kamath
76a748e62f Tell installd when boot completes.
installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.

bug: 18280671

Change-Id: I878f1463c7f523892605c17b980a51ac3b6645e2
2014-11-11 10:50:46 +00:00
Dianne Hackborn
95ef0ac777 am 525da301: am 85d558cd: Add Activity API to get referrer information.
* commit '525da301930e554dc331828adee35613f945c250':
  Add Activity API to get referrer information.
2014-11-11 00:55:10 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information.
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want.  However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information.  It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists.  The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras.  We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme.  Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
2014-11-11 00:42:18 +00:00
Alan Viverette
8c95fb8cba am e1362d11: am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev
* commit 'e1362d1170471fe3d9946c4812509d7742b0724b':
  Call OnTimeChangedListener when new TimePicker values are selected
2014-11-11 00:30:03 +00:00
George Mount
a0bac6434c am 2fe4961d: am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev
* commit '2fe4961d0ddd490d5a82054537697c43cbfd5809':
  Only modify add Transition targets when they aren't targeted.
2014-11-11 00:29:50 +00:00