Commit Graph

3914 Commits

Author SHA1 Message Date
Christopher Tate
f75301f7b1 am 93fb1553: am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev
* commit '93fb155344e076d7ac2dfc5570c8d560c206ae0e':
  Don't crash just because invalid datasets were offered for restore
2014-11-17 21:05:10 +00:00
Christopher Tate
94d963381d Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev 2014-11-17 20:20:12 +00:00
Ying Wang
c204504773 resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp
Change-Id: Id3130cf4a23f07953e06301fe93f1da54b9ca191
2014-11-17 10:56:26 -08:00
Ying Wang
0de36e51c5 Move preloaded-classes out of framework.jar.
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
2014-11-17 10:15:39 +00:00
Christopher Tate
824392bdbd Don't crash just because invalid datasets were offered for restore
In practice, recognize that the current transport state may not yet
incorporate a valid restore data stream object, so don't go making
assumptions that it's usable / closeable / etc.

Bug 18379004

Change-Id: I221e04b5b83438e37455e025d67f412d3abb8c50
2014-11-14 18:27:36 -08:00
Dianne Hackborn
46a318e22f am e91ab7f0: am 377d80ba: Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev
* commit 'e91ab7f0809886861268dde78158ee0f413b58f4':
  Put native apps above browser in resolver activity.
2014-11-13 00:16:13 +00:00
Dianne Hackborn
377d80ba53 Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 2014-11-13 00:03:53 +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
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
Adrian Roos
6fafa8cdce am 36d059f9: am 138b8334: Obliterate LockPatternUtilsCache
* commit '36d059f9d995c8f52b9e6f0c6b540801ec249990':
  Obliterate LockPatternUtilsCache
2014-11-12 11:37:27 +00:00
Adrian Roos
138b83347b Obliterate LockPatternUtilsCache
It is disabled dead code already and not useful anymore
with the new caching in LockSettingsService.

Bug: 18163444
Change-Id: Icc184e923e0fbeab31ed128336c01f835b24c6f2
2014-11-12 11:31:38 +00:00
Dianne Hackborn
ec452d9ff5 Put native apps above browser in resolver activity.
Add a special case for situations where we have some activities
that are matching a URI host/path, so that these are ordered
above others.  This only happens when dealing with http or https
intents, for ordering native apps above the browser.

Change-Id: I21f3361229bc7a1ebefda66373d31b6b1fd19973
2014-11-11 17:38:12 -08: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
Adrian Roos
8953c119fd am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71
* commit '4dfc666cd2e77602c98b0c5214169f5fb47af846':
  Disable LockPatternUtilsCache
2014-11-10 22:04:27 +00:00
Adrian Roos
450ce9fc8a Disable LockPatternUtilsCache
Also fix a bug where hasPattern and hasPassword were
not invalidated properly.

Bug: 18163444
Change-Id: I5bd8cc4e7c0d00497ee7a42f3c34449aa3f95a6c
2014-11-10 19:16:41 +01:00
Mike Lockwood
5a880e7202 am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5
* commit 'd73463c61a9ada1083155214be15ba3c653b73f5':
  Add dumpsys support for bluetooth
2014-11-08 03:00:35 +00:00
Mike Lockwood
95c05a590f Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev 2014-11-08 02:15:28 +00:00
Jeff Sharkey
284ab646d8 am f13fe148: am 001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev
* commit 'f13fe14853ca13830e2bf293f3a24a965570b507':
  ProcessCpuTracker touching proc is fine.
2014-11-07 23:13:41 +00:00
Jeff Sharkey
001b2e9303 Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 2014-11-07 23:03:12 +00:00
Jeff Sharkey
ccce016fb1 ProcessCpuTracker touching proc is fine.
Otherwise we spew hundreds of StrictMode violations.

Bug: 18261125
Change-Id: I2e5ff697b99f55bb73e806f04dba8384e6f1b935
2014-11-07 14:55:17 -08:00
Jason Monk
81f5fa7422 am 88aad1af: am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev
* commit '88aad1af7f6f3f775d10b8ea5e61225c0c89d3d1':
  Plumbing for screen pinning request from sysui
2014-11-07 19:07:15 +00:00
Jason Monk
2f04d16f16 Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 2014-11-07 18:53:54 +00:00
Yohei Yukawa
d1f629f36b am 42be51bd: Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev automerge: 50ef3d9
* commit '42be51bd98660b608596e6a8db63735ae552c996':
  Minimize the number of default enabled IMEs part 4
2014-11-07 00:09:50 +00:00
Jason Monk
5565cb42f2 Plumbing for screen pinning request from sysui
Removes lock-to-app request dialog from the AM.

Added a showScreenPinningRequest to IStatusBar to handle the
flow from app requesting lock task to showing the dialog.

This CL also allows startLockTaskOnCurrent (system|signature) to
start lock task directly.  (Note: this is the less locked version
that always allows exit through back + recents)

Bug: 16957435
Change-Id: I284918dd5989de6cb2767c2a717529eb5e9c6db4
2014-11-06 15:53:43 -05:00
Yohei Yukawa
b21220efae Minimize the number of default enabled IMEs part 4
This is a follow up CL for recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845

It turned out that the changes made in part2 and part3 are
a bit overkill, and users will see no software keyboards
in some particular situations. The problem we missed in
the previous CLs is the fact that
InputMethodInfo#isDefault is indeed a locale-dependent
value, hence it may vary depending on the system locale.
Existing unittests also failed to abstract such
locale-dependent nature.

In order to addresses that regression, the selection logic
is a bit widely reorganized in this CL.  Now the logic is
implemented as a series of fallback rules.

Also, unit tests are updated to be able to 1) test the
order of the enabled IMEs, and 2) emulate the
locale-dependent behavior of InputMethodInfo#isDefault
to enrich test cases.

BUG: 17347871
BUG: 18192576
Change-Id: I871ccda787eb0f1099ba3574356c1da4b33681f3
2014-11-06 15:28:06 +09:00
Nicolas Prevot
ca97de917f am 20519367: am 8da8ab5c: Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev
* commit '205193675fa2e09870c4962405b30e18ab47e3e6':
  An intent forwarded from a chooser intent will be a chooser too.
2014-11-04 11:15:50 +00:00
Nicolas Prevot
8da8ab5cf2 Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev 2014-11-04 11:08:19 +00:00
Sander Alewijnse
654fcad705 am 9ceafdb7: am 47ffc605: Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev
* commit '9ceafdb79473e28173e523bda8b1bc7982907726':
  Show message when intent is forwarded across profiles.
2014-11-04 10:35:02 +00:00
Sander Alewijnse
47ffc60578 Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev 2014-11-04 10:24:28 +00:00
Adrian Roos
1814f14c7d am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev
automerge: fcad9e1

* commit 'fcad9e17413da20db95a2cccbfc8641d2f30a4e6':
  Fix colored status bar panning issues
2014-11-03 15:48:21 +00:00
Adrian Roos
808fe6f99f Merge "Fix colored status bar panning issues" into lmp-mr1-dev 2014-11-03 15:44:08 +00:00
Adrian Roos
670edcb535 am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev
automerge: 8af07f4

* commit '8af07f4717359c8421bc91c8171fcf749714b08f':
  Improve dump of status bar service
2014-11-03 15:02:09 +00:00
Adrian Roos
862d72e2f4 Merge "Improve dump of status bar service" into lmp-mr1-dev 2014-11-03 14:56:48 +00:00
Nicolas Prevot
0e2b73f685 An intent forwarded from a chooser intent will be a chooser too.
If a chooser intent is fired:
If the user picks "work" or "personal apps":
send a chooser intent to the other profile instead of sending a normal intent.

Also using a userId instead of a userHandle for the target user.

BUG:16514027

Change-Id: I2e45cd57ad72e9b7280e772b31fc10938642ba59
2014-11-03 14:36:11 +00:00
Sander Alewijnse
f654533f2d Show message when intent is forwarded across profiles.
In resolver activity. Solution uses the contentUserHint.

Bug:17199630
Change-Id: I208e55a2bb37c7cd147240986c7659fc66f3e228
2014-11-03 11:59:33 +00:00
Dianne Hackborn
58f2a1e8a4 am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev
automerge: 1816361

* commit '18163616c80aa30f4b7389838d8658812615080c':
  Improve low on RAM reporting.
2014-10-31 23:23:40 +00:00
Dianne Hackborn
f34fa3e7aa Merge "Improve low on RAM reporting." into lmp-mr1-dev 2014-10-31 22:44:24 +00:00
Adam Powell
dec2509d70 am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev
automerge: 63bb338

* commit '63bb33832380feb546d1a20d8f1c057f2088aed5':
  Allow swipe down to dismiss for ResolverDrawerLayout
2014-10-31 20:35:42 +00:00
Dianne Hackborn
6edb5c665d Improve low on RAM reporting.
- Don't print every little native process.
- Print in different sections, so if one is too long we don't get the
  rest truncated in the log.
- Include other info from meminfo -- ksm and free/used/lost summary.

Change-Id: Iea4ec3860212667e195d2b60b3ded23bfec78436
2014-10-31 10:35:15 -07:00
Adam Powell
5dd072d884 Allow swipe down to dismiss for ResolverDrawerLayout
Let the user swipe the intent resolver UI off of the screen to get rid
of it. So satisfying!

Also fix a bug where transitioning between touching the area outside
of the drawer to the drawer itself would misbehave or otherwise
dismiss when it shouldn't.

Bug 18026675

Change-Id: I456cc22b9575dc4c65e45154dc81201fe2045adc
2014-10-30 19:51:41 -07:00
Craig Mautner
6a80527f61 am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
  Add enter-animation-done callback for system windows
2014-10-31 00:29:52 +00:00
Alan Viverette
b65a27da39 am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev
* commit 'd93421b1438607f7656c7b65163c6681526693b0':
  Remove scroll view from correct parent in AlertController
2014-10-31 00:29:29 +00:00
Yigit Boyar
9d0a2dc15d am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev
* commit '012e06bcb965c76e696ebc2e09e5eaaf97129d91':
  Move all actionbar related methods to DecorToolbar
2014-10-31 00:15:16 +00:00
Alan Viverette
349e93ea65 am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
* commit '65d792e46cad687b2457ac4903cd489ec9dc77e6':
  Show scroll indicators in AlertDialog
2014-10-31 00:14:38 +00:00
Alan Viverette
bfc8599f43 am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
* commit 'b2449a399b0e67ab60c592baca9063540b8c1637':
  Use action mode context for ActionMode menu inflater
2014-10-30 23:43:58 +00:00
Craig Mautner
159da3dba8 Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 2014-10-30 22:12:31 +00:00
Craig Mautner
9c79504225 Add enter-animation-done callback for system windows
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.

The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.

Fixes bug 16661752.

Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
2014-10-30 14:43:18 -07:00
Alan Viverette
35c3cb6a59 Remove scroll view from correct parent in AlertController
BUG: 18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
2014-10-30 13:51:21 -07:00
Alan Viverette
25128b0b5a am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev
automerge: b00c424

* commit 'b00c4242579ac9c42c01656cb7b10f394f55a445':
  Inflate ActionMode items against the ActionBarContextView theme
2014-10-30 19:05:27 +00:00