Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,040 Commits 3 Branches 0 Tags
4985297bd7452376afa8f3c06490431fc03bf310
Commit Graph

22989 Commits

Author SHA1 Message Date
Dianne Hackborn
35ed2f4c39 am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information. 
* commit '95ef0ac77738eac98e4952fe1e94db64c1560f5e':
  Add Activity API to get referrer information.
 2014-11-11 01:03:02 +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
Adrian Roos
ba070ec037 am 15f7b37b: am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev automerge: 09fc10f 
* commit '15f7b37b3c9e197a99d1f5833a751e38900e403a':
  Add LockSettingsStorage tests
 2014-11-11 00:10:38 +00:00
Adrian Roos
15f7b37b3c am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev 
automerge: 09fc10f

* commit '09fc10f18f6fac8d48e4a46a3a954c336f2bd8be':
  Add LockSettingsStorage tests
 2014-11-11 00:03:08 +00:00
Adrian Roos
fa6aa121cd am b7f42187: am 7dc3d703: Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev automerge: e6ef98c 
* commit 'b7f421875e7a08839971a116cfcf662803987e70':
  Add caching to LockSettingsStorage
 2014-11-10 22:42:51 +00:00
Adrian Roos
f2bd3cc9df Merge "Add LockSettingsStorage tests" into lmp-mr1-dev 2014-11-10 22:37:36 +00:00
Adrian Roos
b7f421875e am 7dc3d703: Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev automerge: e6ef98c 
* commit '7dc3d7033b4b7a90514772dbee9702257f1fe367':
  Add caching to LockSettingsStorage
 2014-11-10 22:35:52 +00:00
John Spurlock
2e30ccfc56 am 7346a1ad: am 551f0778: Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev automerge: 7936ca3 
* commit '7346a1ad0a9eb3e93387b328b49d5d6a23336d3e':
  Zen: Pull next-alarm tracking out into separate helper.
 2014-11-10 22:13:27 +00:00
Adrian Roos
d09f5bd031 am 8953c119: am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71 
* commit '8953c119fd81a20c56bf0ee30a6830dfbae9649b':
  Disable LockPatternUtilsCache
 2014-11-10 22:13:18 +00:00
Dan Sandler
f2d9b00832 am 34f24aef: am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit '34f24aef58b015709447cb09bad5f7ae0ca7989c':
  Fix inset hinting when adding window
 2014-11-10 22:13:03 +00:00
John Spurlock
7346a1ad0a am 551f0778: Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev automerge: 7936ca3 
* commit '551f0778c39b030ebf1fd51c882c152b3e7ac320':
  Zen: Pull next-alarm tracking out into separate helper.
 2014-11-10 22:04:39 +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
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
 2014-11-10 22:04:09 +00:00
Adrian Roos
e542499a30 Add LockSettingsStorage tests 
Bug: 18163444
Change-Id: I563276e6d445d43d05bf0d3c633440a8e0109b69
 2014-11-10 21:03:12 +00:00
Adrian Roos
e6ef98cf05 Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev 2014-11-10 20:33:10 +00:00
Adrian Roos
3dcae68501 Add caching to LockSettingsStorage 
Bug: 18163444
Change-Id: I4caa80ca55efec761e965807ae793db41864321f
 2014-11-10 21:27:49 +01:00
John Spurlock
7936ca36d9 Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev 2014-11-10 19:24:16 +00:00
John Spurlock
6b0623a112 Zen: Pull next-alarm tracking out into separate helper. 
In preparation for sharing with DowntimeConditionProvider.

Bug: 16373455
Change-Id: If8d90187fa399935137c7ba6152925a9106a4596
 2014-11-10 14:05:13 -05:00
Adrian Roos
a0ecc714c3 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 2014-11-10 18:35:59 +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
Dan Sandler
04a1557c49 Merge "Fix inset hinting when adding window" into lmp-mr1-dev 2014-11-10 18:10:36 +00:00
Paul Jensen
357175a3ba am f8059887: am 78a853d1: am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 
* commit 'f805988770761e2446436d4e5fac58b3e95faac5':
  Fix NetworkMonitor logging to include NetID.
 2014-11-10 17:41:43 +00:00
Paul Jensen
f805988770 am 78a853d1: am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 
* commit '78a853d17a33958ebc7d014cc6ec3998696302d3':
  Fix NetworkMonitor logging to include NetID.
 2014-11-10 17:36:56 +00:00
Paul Jensen
cb32559a1e Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 2014-11-10 17:27:12 +00:00
Adrian Roos
37d7a68de7 Fix inset hinting when adding window 
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.

Also adds hinting for the stable insets.

Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
 2014-11-10 17:46:57 +01:00
Paul Jensen
532b6143f6 Fix NetworkMonitor logging to include NetID. 
This was broken when NetID selection was moved to after
NetworkAgentInfo construction time.  NetworkMonitor inherits
from StateMachine whose log tag is immutable after construction
making it impossible to include the NetID.  Instead define a
simple log function in NetworkMonitor that includes correct
NetID.  This makes debugging via logs much easier and avoids
ambiguities that can make logs useless.

Change-Id: Ie72fc210b92bd425184d288b35ed476669e2e073
 2014-11-10 09:50:02 -05:00
Jungshik Jang
11eb372a90 am 7403d656: am 324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev 
automerge: a981a71

* commit 'a981a715c429bcdfe648e05d6de088ad5aa31419':
  CEC: Send <Give System Audio Mode> regardless of TV's setting.
 2014-11-10 01:25:52 +00:00
Jungshik Jang
a981a715c4 am 7403d656: am 324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev 
* commit '7403d656470dd7b4875e006410e257795a09d183':
  CEC: Send <Give System Audio Mode> regardless of TV's setting.
 2014-11-10 01:10:31 +00:00
Jungshik Jang
324b1f8a47 Merge "CEC: Send <Give System Audio Mode> regardless of TV's setting." into lmp-mr1-dev 2014-11-10 00:54:33 +00:00
Mike Lockwood
7c2b60ed37 am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5 
automerge: 5a880e72

* commit '5a880e72024882d1a4ad5a04a4cb4a6aa5e6d426':
  Add dumpsys support for bluetooth
 2014-11-08 03:09:13 +00:00
Adam Lesinski
a4d5542ae4 am b94de814: Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev automerge: 96f635e 
automerge: 4f163bd

* commit '4f163bd8acc1b00394c1fae7c2ffc42fc5ca2790':
  UsageStatsService: Update file index to prevent double checkin
 2014-11-08 03:07:57 +00:00
Amith Yamasani
78673cc6aa am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519 
automerge: 2a21f24

* commit '2a21f247885780d90873bb25aa7c7f710e4bffcc':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 03:05:45 +00: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
Adam Lesinski
4f163bd8ac am b94de814: Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev automerge: 96f635e 
* commit 'b94de814479749818e30dace03c70697485c7809':
  UsageStatsService: Update file index to prevent double checkin
 2014-11-08 03:00:29 +00:00
Amith Yamasani
2a21f24788 am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519 
* commit '1aeab291764b77ffa2c6e6eb28441beec6fa041c':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 02:59:55 +00:00
Mike Lockwood
95c05a590f Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev 2014-11-08 02:15:28 +00:00
Adam Lesinski
96f635ed5b Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev 2014-11-08 02:07:45 +00:00
Amith Yamasani
395b519f4b Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev 2014-11-08 01:39:12 +00:00
Adam Lesinski
0fb25fae8f UsageStatsService: Update file index to prevent double checkin 
We seem to have renamed a file as checked-in twice, which means
we checked it in twice and created a malformed name with the suffix
"-c-c" instead of the correct suffix "-c".

Bug:18280677
Change-Id: Ie3164010898a333e5d9b97151d285ea376de799e
 2014-11-07 17:36:27 -08:00
Amith Yamasani
83b6ef01a0 Inform PendingIntent sender if broadcast was not queued. 
If the broadcast could not be queued due to a stopped user, the
party trying to send a PendingIntent should be notified right away.
Otherwise, for instance, AlarmManager could be waiting forever to
be called back after the broadcast is delivered.

This is a potential fix for:
Bug: 18290018

Change-Id: I07c0751e80f11e69dfa2be5c96a033aecb298b81
 2014-11-07 15:34:04 -08:00
Christopher Tate
be98cdce1c am b63fd56b: am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit 'b63fd56b396dab177959ee33fe41ff40ff5c3c7f':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:13:29 +00:00
Christopher Tate
b63fd56b39 am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit 'e5205d1ae491a97197d12fc2bc5afe1a449cf75d':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:08:49 +00:00
Christopher Tate
48a7c3b522 Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 2014-11-07 23:00:24 +00:00
Jason Monk
2a472ffa7a am aac9f433: am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit 'aac9f433ff3db2b39dc143956e4ab9aabf76e3e9':
  Material design for screen pinning cling
 2014-11-07 19:34:12 +00:00
Jason Monk
0aee5a9b80 am 81f5fa74: am 88aad1af: am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 
* commit '81f5fa7422c8c531702427f508df3c069baf8c7e':
  Plumbing for screen pinning request from sysui
 2014-11-07 19:33:30 +00:00
Jason Monk
aac9f433ff am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit '68d0089c66b67b2df2b4c3d9f9e68bbcae637d79':
  Material design for screen pinning cling
 2014-11-07 19:12:03 +00: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
975590f229 Merge "Material design for screen pinning cling" into lmp-mr1-dev 2014-11-07 18:59:25 +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