OSDN Git Service
Abodunrinwa Toki [Tue, 16 Jun 2015 15:54:24 +0000 (15:54 +0000)]
Merge "Fix floating toolbar flickers." into mnc-dev
George Mount [Tue, 16 Jun 2015 15:27:25 +0000 (15:27 +0000)]
Merge "Have the final setVisibility cause a requestLayout." into mnc-dev
Abodunrinwa Toki [Tue, 16 Jun 2015 14:47:04 +0000 (15:47 +0100)]
Fix floating toolbar flickers.
-Flicker was a side effect the delay in hiding the toolbar when
there is a down press on a TextView handle. The timing clashed
with the time it takes for the FloatingActionMode to release a
hide lock on a changing content rect. Extra flickers also happened
if the ActionMode happened to be invalidated at about the same time.
Since there was no longer a hide lock, the toolbar refreshed, getting
rid of the "Select all" menu item.
FIX. I believe we don't need the delayed hide on down press on a
TextView handle. I've removed this.
-I've also updated FloatingActionMode to ensure that hide locks
overlap one another if necessary. The toolbar can only be visible if
all locks are off.
Bug:
21793687
Change-Id: I290ea45ab17d5862b453cb319afb4c8ffe084cd0
Mark Salyzyn [Fri, 24 Apr 2015 22:55:40 +0000 (15:55 -0700)]
jni: isLoggable calls __android_log_is_loggable
(cherry pick from commit
8685a4569d2bdcb1a7361e3d75f832cf3ba9d4b6)
Will inherit additional functionality and cache improvements
Bug:
17760225
Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
Benjamin Franz [Tue, 16 Jun 2015 13:22:19 +0000 (13:22 +0000)]
Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
Clara Bayarri [Tue, 16 Jun 2015 12:41:06 +0000 (12:41 +0000)]
Merge "Add suggested width for Floating Toolbar on large devices" into mnc-dev
Abodunrinwa Toki [Tue, 16 Jun 2015 12:29:52 +0000 (12:29 +0000)]
Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
Narayan Kamath [Tue, 16 Jun 2015 11:50:56 +0000 (11:50 +0000)]
Merge "Better systrace slices for application startup." into mnc-dev
Paul Jensen [Tue, 16 Jun 2015 11:30:49 +0000 (11:30 +0000)]
Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
Narayan Kamath [Fri, 12 Jun 2015 14:34:35 +0000 (15:34 +0100)]
Better systrace slices for application startup.
This change adds three new timeslices :
- PostFork : As soon as possible after the app forks from the
zygote. Can be used in conjunction with the system_server
"Start proc:" event to derive an upper bound on fork() and
zygote overhead.
- RuntimeInit & ActivityThreadMain for ZygoteInit#runtimeInit
and ActivityThread#main.
ActivityThread#handleBindApplication and higher level functions
are already well instrumented in systrace. handleBindApplication
should occur immediately after ActivityThread#main.
Note that we use the Activity manager tag to make it easier to
correlate these new events with surrounding events (Start proc
and handleBindApplication) that are already using the AM tag.
bug:
21632700
Change-Id: Ibc01f1721f962c913f3c02a51763b6feb1eb6a4d
Benjamin Franz [Tue, 16 Jun 2015 10:23:38 +0000 (11:23 +0100)]
Update documentation for PASSWORD_QUALITY_SOMETHING
Add a mention that PASSWORD_QUALITY_SOMETHING includes patterns.
Bug:
20441473
Change-Id: I2608f36e338fb2bfbace80d49ee805841d59fa17
Jeff Sharkey [Fri, 20 Mar 2015 18:24:04 +0000 (11:24 -0700)]
Yet another user restriction.
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
Jeff Sharkey [Tue, 16 Jun 2015 04:47:16 +0000 (04:47 +0000)]
Merge "Update file size formatting." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 04:09:10 +0000 (21:09 -0700)]
Update file size formatting.
Per UX, default strings should have space between value and units
resulting in "12.3 GB". Add a formatting variant that returns the
various components for callers who want to build their own strings.
For now there is only one mounted emulated volume at a time, and
it's always the primary storage, so give it the default rootId to
keep old Uris working.
Change-Id: Ifcc72a91a6b397ee65dc92642153286186eb64ac
Selim Cinek [Tue, 16 Jun 2015 04:16:01 +0000 (04:16 +0000)]
Merge "Fixed a bug where the statusbar was still visible while dozing" into mnc-dev
Selim Cinek [Tue, 16 Jun 2015 03:55:04 +0000 (20:55 -0700)]
Fixed a bug where the statusbar was still visible while dozing
Bug:
18903923
Change-Id: I9c0c85e40ff7e7be2e9c4122fe5786de3649426c
Jim Miller [Tue, 16 Jun 2015 03:48:55 +0000 (03:48 +0000)]
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
Erik Kline [Tue, 16 Jun 2015 03:43:53 +0000 (03:43 +0000)]
Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
Jim Miller [Tue, 16 Jun 2015 03:39:44 +0000 (20:39 -0700)]
Limit number of fingerprint templates that can be enrolled per device user
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug
20731847
Change-Id: I5bc337698bef682cdf67940906d24842e1dffc28
Paul Jensen [Thu, 11 Jun 2015 13:43:30 +0000 (09:43 -0400)]
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
- There are no callers of
NetworkInfo.setIsConnectedToProvisioningNetwork(), so remove all the
code that deals with mIsConnectedToProvisioningNetwork being true,
including the two ConnectiviyManager APIs.
- There are no callers of
ConnectivityManager.getMobileRedirectedProvisioningUrl(), so remove
the code that reads this URL.
- There are no callers of
ConnectivityManager.captivePortalCheckCompleted(), so remove this
API which is currently a no-op.
Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
Daichi Hirono [Tue, 16 Jun 2015 01:30:28 +0000 (01:30 +0000)]
Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 01:17:59 +0000 (01:17 +0000)]
Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 01:16:58 +0000 (18:16 -0700)]
Fix unnecessairy announcements when collapsing shade
Bug:
20171694
Change-Id: Iec73098e2f778dac4a920a717385139952017330
Ruben Brunk [Tue, 16 Jun 2015 01:12:56 +0000 (01:12 +0000)]
Merge "Add metadata for pre-distortion dimensions." into mnc-dev
Christopher Tate [Tue, 16 Jun 2015 01:10:41 +0000 (01:10 +0000)]
Merge "Clean up app-link verification policy" into mnc-dev
Ruben Brunk [Tue, 16 Jun 2015 00:32:06 +0000 (17:32 -0700)]
Add metadata for pre-distortion dimensions.
Bug:
20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
Makoto Onuki [Tue, 16 Jun 2015 00:51:35 +0000 (00:51 +0000)]
Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev
Adam Lesinski [Tue, 16 Jun 2015 00:46:04 +0000 (00:46 +0000)]
Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 00:35:11 +0000 (00:35 +0000)]
Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev
Makoto Onuki [Tue, 16 Jun 2015 00:26:40 +0000 (17:26 -0700)]
Allow killApplicationWithAppId() on secondary users
Bug
20949609
Change-Id: If0e766aeb3e8b4aa6aebed3b75bcedd75251e382
Adrian Roos [Tue, 16 Jun 2015 00:27:01 +0000 (17:27 -0700)]
Fix accessibility ghosts in quick settings detail
Fixes a bug where the tile that was just clicked on
to go to the detail view would become visible and cause
confusion to accessibility services.
Bug:
20209718
Change-Id: I1678a4fc35e8d739b7c657e868b02a25eddcba1d
Adam Lesinski [Tue, 16 Jun 2015 00:19:07 +0000 (17:19 -0700)]
Bluetooth energy: fix overflow in calculation
Use longs instead of ints, because the energy values can get pretty
high.
Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671
Junda Liu [Mon, 15 Jun 2015 23:54:36 +0000 (23:54 +0000)]
Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 23:49:17 +0000 (23:49 +0000)]
Merge "Add AssistUtils" into mnc-dev
George Mount [Mon, 15 Jun 2015 23:17:04 +0000 (16:17 -0700)]
Have the final setVisibility cause a requestLayout.
Bug
21770464
Change-Id: I8c501e8a681634cb87857cf9286b888e61101f13
Junda Liu [Mon, 15 Jun 2015 20:15:28 +0000 (13:15 -0700)]
Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
Bug: b/
21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
Quddus Chong [Mon, 15 Jun 2015 23:11:02 +0000 (23:11 +0000)]
am
418ff647: am
79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug:
19298571" into mnc-preview-docs
* commit '
418ff64748cb866d3dec8a448efffb0cbceec52d':
docs: Fixed broken links in TV publishing checklist. bug:
19298571
Adrian Roos [Mon, 15 Jun 2015 20:23:14 +0000 (13:23 -0700)]
Add AssistUtils
Enables code sharing with Settings for consistent
default value handling.
Bug:
21780590
Change-Id: I669b673f90fab503ae0c2179f09ebac9592bd33a
Adrian Roos [Mon, 15 Jun 2015 22:58:35 +0000 (15:58 -0700)]
Fix stuck orientation in SetupWizard
Bug:
21755092
Change-Id: I3144a81523ce2ef4bf6dc457c0ea4b9723dae489
Quddus Chong [Mon, 15 Jun 2015 22:59:13 +0000 (22:59 +0000)]
am
79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug:
19298571" into mnc-preview-docs
* commit '
79b30681bbe26b95a8705e17957c1063517ec8f3':
docs: Fixed broken links in TV publishing checklist. bug:
19298571
Zhijun He [Mon, 15 Jun 2015 22:58:47 +0000 (22:58 +0000)]
Merge "Camera2: fix Surface cast issue" into mnc-dev
Christopher Tate [Sat, 13 Jun 2015 01:31:24 +0000 (18:31 -0700)]
Clean up app-link verification policy
If an app claims to be the official auto-verified app for any domain
and thus the automatic handler for ACTION_VIEW / {http,https}://...
intents naming that domain, then we require that it verify as the
official app for *all* domains it purports to handle, even if the
other domains are not flagged for verify.
Bug
21335460
Change-Id: I3fdd8620defa31aea36ce738fa63ac94fc53c5f7
John Spurlock [Mon, 15 Jun 2015 22:50:51 +0000 (22:50 +0000)]
am
4393a7d2: am
c0d84934: am
076c599f: am
1ad5c813: Fix typo in TtsSpan.
* commit '
4393a7d2645cfb9097e616016c58887b9929be55':
Fix typo in TtsSpan.
Quddus Chong [Mon, 15 Jun 2015 22:42:41 +0000 (22:42 +0000)]
Merge "docs: Fixed broken links in TV publishing checklist. bug:
19298571" into mnc-preview-docs
Alex Klyubin [Mon, 15 Jun 2015 22:42:02 +0000 (22:42 +0000)]
Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev
Quddus Chong [Mon, 15 Jun 2015 22:27:17 +0000 (15:27 -0700)]
docs: Fixed broken links in TV publishing checklist.
bug:
19298571
Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013
John Spurlock [Mon, 15 Jun 2015 22:39:12 +0000 (22:39 +0000)]
am
c0d84934: am
076c599f: am
1ad5c813: Fix typo in TtsSpan.
* commit '
c0d849348ae9fb36e725d0644a4927e2e5146295':
Fix typo in TtsSpan.
Ruben Brunk [Mon, 15 Jun 2015 22:34:18 +0000 (22:34 +0000)]
Merge "Add addional scale component for radialDistortion." into mnc-dev
Ruben Brunk [Mon, 15 Jun 2015 22:33:09 +0000 (15:33 -0700)]
Add addional scale component for radialDistortion.
Bug:
20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7
Selim Cinek [Mon, 15 Jun 2015 22:30:50 +0000 (22:30 +0000)]
Merge "Fixed a bug when resolving theme attributes" into mnc-dev
John Spurlock [Mon, 15 Jun 2015 22:23:24 +0000 (22:23 +0000)]
am
076c599f: am
1ad5c813: Fix typo in TtsSpan.
* commit '
076c599feb9a18b250de7020c2f1c01561c509f9':
Fix typo in TtsSpan.
Alex Klyubin [Mon, 15 Jun 2015 22:16:09 +0000 (15:16 -0700)]
Fix Android Keystore key gen for keys requiring user auth.
When Android Keystore generates an asymmetric key pair, it needs to
create a self-signed certificate for that pair, in order to expose
the key pair in the JCA KeyStore abstraction through which keys are
later retrieved. The self-signed certificate is normally signed with
the private key.
This CL avoids using the private key to sign the certificate if the
private key can be used only once the user has been authenticated.
For such keys, a fake (non-verifying) signature is used on the
certificate, same as for cases where the key is not authorized for
signing.
Bug:
21852844
Change-Id: Id78bc1f51d12950db4e37c1e0da6c60057d4e693
Amit Mahajan [Mon, 15 Jun 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Adding config variables for triggering CI action on System update." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 22:11:30 +0000 (22:11 +0000)]
am
1ad5c813: Fix typo in TtsSpan.
* commit '
1ad5c813211d4d855a0d5396855c80653480aaa4':
Fix typo in TtsSpan.
Raph Levien [Mon, 15 Jun 2015 21:29:45 +0000 (21:29 +0000)]
Merge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev
Yorke Lee [Mon, 15 Jun 2015 21:23:26 +0000 (21:23 +0000)]
Merge "Send broadcast when default dialer changes" into mnc-dev
George Mount [Thu, 11 Jun 2015 22:32:14 +0000 (15:32 -0700)]
Fix blink in Explode transition.
Bug
21785708
Change-Id: I1250d8e084601a6267906fdb2f3df46cbb8161fc
John Spurlock [Mon, 15 Jun 2015 21:03:53 +0000 (21:03 +0000)]
Merge "QS: Add disable animations for the DND tile." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 17:49:57 +0000 (13:49 -0400)]
QS: Add disable animations for the DND tile.
Elide the disabled -> enabled anim, since we launch
the detail panel instead.
Bug:
21118976
Change-Id: I392f848641190f114b7838515acb13f22c96e37d
John Spurlock [Mon, 15 Jun 2015 20:14:48 +0000 (20:14 +0000)]
Merge "QS icon sizes should be 24dp." into mnc-dev
Selim Cinek [Mon, 15 Jun 2015 20:09:25 +0000 (13:09 -0700)]
Fixed a bug when resolving theme attributes
This could lead to a crash.
Bug:
21705571
Change-Id: I8afb0725d6af59bdeac97f4aec58d0f4a2406905
John Spurlock [Mon, 15 Jun 2015 19:45:38 +0000 (15:45 -0400)]
QS icon sizes should be 24dp.
Not 28dp.
Bug:
21118976
Change-Id: I9cc326d1333d85b783b85e3238a2a506bf3b55c0
Abodunrinwa Toki [Fri, 12 Jun 2015 14:35:51 +0000 (15:35 +0100)]
Floating toolbar no longer obstructs the soft keyboard.
-The toolbar popupwindow is set to "need" the keyboard
-Updated toolbar positioning bounds
-Updated toolbar positioning depending on available space
Bug:
21304845
Change-Id: I8d8a59ef6ea639b11bb32cfeb6ead52087fb91e4
George Mount [Mon, 15 Jun 2015 19:43:55 +0000 (19:43 +0000)]
Merge "Limit shared element transition to shared elements and children." into mnc-dev
Vladislav Kaznacheev [Mon, 15 Jun 2015 19:43:10 +0000 (19:43 +0000)]
Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev
Yorke Lee [Mon, 15 Jun 2015 19:08:24 +0000 (12:08 -0700)]
Send broadcast when default dialer changes
Add hidden TelecomManager.setDefaultDialer for system apps
to set the default dialer and trigger the broadcast
Bug:
21846308
Change-Id: Ifdd30cd1323ab0157edf7fd966173b6c52df6ba0
Adam Powell [Mon, 15 Jun 2015 19:25:18 +0000 (19:25 +0000)]
Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 19:24:09 +0000 (19:24 +0000)]
Merge "Only re-register callbacks if tuning changed" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 19:02:56 +0000 (15:02 -0400)]
Only re-register callbacks if tuning changed
We only need to get the state if the tuning has actually changed.
Currently we hit this every time we open QS which breaks the alpha
animation on the mobile icon.
Bug:
21791609
Change-Id: I3d77a2d0f81d2d7bed600ccd7a2d2c2b4a262db7
Jason Monk [Mon, 15 Jun 2015 19:16:35 +0000 (19:16 +0000)]
Merge "Fix EmergencyCallback in NetworkController" into mnc-dev
Dianne Hackborn [Mon, 15 Jun 2015 19:12:12 +0000 (19:12 +0000)]
Merge "Fix issue #
21813831: Need API for asking to be added to power whitelist" into mnc-dev
Dianne Hackborn [Sat, 13 Jun 2015 01:11:41 +0000 (18:11 -0700)]
Fix issue #
21813831: Need API for asking to be added to power whitelist
Add the API. Clean up a few related things.
Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
Alan Viverette [Mon, 15 Jun 2015 18:05:09 +0000 (18:05 +0000)]
Merge "Obtain handler from context in CaptioningManager" into mnc-dev
Christopher Tate [Mon, 15 Jun 2015 17:56:16 +0000 (17:56 +0000)]
Merge "Use HTTPS when fetching app link verification resources" into mnc-dev
Joseph Wen [Mon, 15 Jun 2015 17:50:13 +0000 (17:50 +0000)]
Merge "Retry intent verification 3 times before failing." into mnc-dev
Alex Klyubin [Mon, 15 Jun 2015 17:45:45 +0000 (17:45 +0000)]
Merge "Remove EcIesParameterSpec until it's needed." into mnc-dev
Alex Klyubin [Mon, 15 Jun 2015 17:43:45 +0000 (17:43 +0000)]
Merge "Document when self-signed certs have invalid signature." into mnc-dev
Clara Bayarri [Mon, 15 Jun 2015 17:26:22 +0000 (18:26 +0100)]
Add suggested width for Floating Toolbar on large devices
The default for non-landscape was too small for tablet devices.
Bug:
21846073
Change-Id: Ic5a1dd5bab5c2a1aa08820f885446da29bb73d84
John Spurlock [Mon, 15 Jun 2015 17:24:02 +0000 (13:24 -0400)]
Fix typo in TtsSpan.
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
Alex Klyubin [Mon, 15 Jun 2015 16:55:36 +0000 (09:55 -0700)]
Remove EcIesParameterSpec until it's needed.
This class was added in Android M to enable us to expose ECIES. ECIES
is not going to happen in Android M. I'm thus removing this unused
class until such time when it's needed.
Bug:
18088752
Change-Id: I16ab1bbd0b4334419c9a8f29d64661c150aa8d32
Zhijun He [Mon, 15 Jun 2015 16:43:55 +0000 (09:43 -0700)]
Camera2: fix Surface cast issue
Can not cast an object array directly to a Surface array.
Change-Id: Ie2cb711f9e1ff0fc17d6038992dc3c7af9471ccf
Yorke Lee [Mon, 15 Jun 2015 16:19:41 +0000 (16:19 +0000)]
Merge "Add adb shell telecom get-system-dialer" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 16:15:45 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 15 Jun 2015 16:14:54 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I72bd7dadaaf60d676140eedd28f33db15c5bfeb6
Auto-generated-cl: translation import
Diego Perez [Mon, 15 Jun 2015 15:48:29 +0000 (15:48 +0000)]
am
fa794eb0: am
2f710356: am
13c06d6c: am
1f33bdad: am
5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '
fa794eb0025dbec6c1b90135495081d42f06bdaf':
Fix for shadows on theme editor
Diego Perez [Mon, 15 Jun 2015 15:48:24 +0000 (15:48 +0000)]
am
40a216d9: am
df6f63ba: am
2422011d: am
b2411c62: am
ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '
40a216d95973bb897ee0d755ef260a616f176798':
Fix GcSnapshot drawInLayer when clipping is used.
Dirk Dougherty [Mon, 15 Jun 2015 15:48:14 +0000 (15:48 +0000)]
am
c6d33420: am
4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
* commit '
c6d3342064db4982298d0ebe79c8b974c57b99a7':
Doc change: move ndk docs jd into main docs tree.
Andrew Solovay [Mon, 15 Jun 2015 15:48:05 +0000 (15:48 +0000)]
am
ecc50268: am
6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit '
ecc50268d72f0084a96bf98494229a294be10458':
docs: Added AfW videos to "Android for Work" landing page
Rich Slogar [Mon, 15 Jun 2015 15:47:49 +0000 (15:47 +0000)]
am
afb19e27: am
726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
* commit '
afb19e27ccc80415956c1b63ddb19e953a7c3f20':
docs: sdk tools 24.3.2 download updates
Diego Perez [Mon, 15 Jun 2015 15:47:44 +0000 (15:47 +0000)]
am
ce5a79da: am
d717682d: am
5c597c1d: am
a8854564: am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
ce5a79dacfb152317429cb69c28fe8bb39c02f4c':
New custom widgets library
Chet Haase [Mon, 15 Jun 2015 15:45:55 +0000 (15:45 +0000)]
Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
Diego Perez [Mon, 15 Jun 2015 15:44:12 +0000 (15:44 +0000)]
Merge "resolved conflicts for merge of
5a53816b to mnc-dev" into mnc-dev
Chet Haase [Sun, 14 Jun 2015 14:45:32 +0000 (07:45 -0700)]
Add isFilterBitmap() overrides where appropriate
Issue #
21825791 add isFilterBitmap() override to appropriate Drawable subclasses
Change-Id: I5cbd72c034be79b0aa53815c7a5a8ea499e6e02d
Jason Monk [Mon, 15 Jun 2015 15:41:36 +0000 (15:41 +0000)]
Merge "Don't try to get entries for uninstalled apps." into mnc-dev
Jason Monk [Mon, 15 Jun 2015 15:38:03 +0000 (11:38 -0400)]
Don't try to get entries for uninstalled apps.
Bug:
21837824
Change-Id: I6f7bbc309e9edf1db12476f55ab8be424739fae0
Diego Perez [Mon, 15 Jun 2015 15:17:08 +0000 (16:17 +0100)]
resolved conflicts for merge of
5a53816b to mnc-dev
Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f
Joseph Wen [Mon, 15 Jun 2015 14:36:03 +0000 (10:36 -0400)]
Retry intent verification 3 times before failing.
BUG=
21596311
Change-Id: Ia98925a4310046ef4d8117afe0b278e6a414dac6
Prashant Malani [Mon, 15 Jun 2015 14:30:35 +0000 (14:30 +0000)]
am
a8cff2ac: (-s ours) am
327b481f: (-s ours) am
786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '
a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Filip Gruszczynski [Mon, 15 Jun 2015 14:30:30 +0000 (14:30 +0000)]
am
94476be6: (-s ours) am
88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '
94476be6a4055d09413d51e489446bf220c440a6':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
Leon Scroggins III [Mon, 15 Jun 2015 14:30:25 +0000 (14:30 +0000)]
am
d7959d30: (-s ours) am
265d053d: am
81babaa3: am
7ffde4a6: am
e899576f: am
48b38452: am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
d7959d30b61962a905de6c5081dac6b2f7be65c1':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes