Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,349 Commits 3 Branches 0 Tags
ba11085635ea3ef9383b34dd44c43f2a6cd832ff
Commit Graph

4635 Commits

Author SHA1 Message Date
Fyodor Kupolov
9e01f2ace5 Merge \\\"Fix the API compatibility of \\\"UriMatcher#addURI\\\"\\\" am: 3e151273a3 am: bc8d946e09 am: dbf07bb8ef 
am: 0d287f1846

Change-Id: Ic9ec776900cbb10470f731409de71ecbf55e700f
 2016-08-01 22:06:15 +00:00
Makoto Onuki
a31a6f9f27 Revert \\"LauncherApps should also throw when user is locked\\" am: 2ec16b08ac am: e330d59c2e 
am: 685091f203

Change-Id: Iacfdd622ce04a86f0f5f573a9e11dc7d1cccc932
 2016-08-01 22:06:08 +00:00
Hidehiko Tsuchiya
0d287f1846 Merge \\\"Fix the API compatibility of \\\"UriMatcher#addURI\\\"\\\" am: 3e151273a3 am: bc8d946e09 
am: dbf07bb8ef

Change-Id: I105800630bb0b5b2ed610c27741eb027d60b61a2
 2016-08-01 17:56:38 +00:00
Fyodor Kupolov
dbf07bb8ef Merge \\"Fix the API compatibility of \\"UriMatcher#addURI\\"\\" am: 3e151273a3 
am: bc8d946e09

Change-Id: I6ab069a0e02e6b1053dafe98671ab68ef99ff527
 2016-08-01 17:50:09 +00:00
Makoto Onuki
685091f203 Revert \\"LauncherApps should also throw when user is locked\\" am: 2ec16b08ac 
am: e330d59c2e

Change-Id: I18070a0a1a69ab8ba366cef5295f09ac598c5e9f
 2016-08-01 17:47:10 +00:00
Hidehiko Tsuchiya
bc8d946e09 Merge \"Fix the API compatibility of \"UriMatcher#addURI\"\" 
am: 3e151273a3

Change-Id: Ic06ade3ce6dd795e7d12cfba150286933512433d
 2016-08-01 17:43:30 +00:00
Makoto Onuki
2ec16b08ac Revert "LauncherApps should also throw when user is locked" 
This reverts commit bc4ad85d29.

Will retry when the updated launcher is in.

Change-Id: I428dc93132615480df70aeca7977089af008c041
 2016-08-01 17:20:59 +00:00
Makoto Onuki
07996bce98 LauncherApps should also throw when user is locked am: bc4ad85d29 am: 5ec63fc3c7 
am: 3b5920b2a1

Change-Id: I60beb409a55297a9a2adaaf52f1ea1e185668c88
 2016-07-31 02:25:45 +00:00
Hidehiko Tsuchiya
5acd41d155 Fix the API compatibility of "UriMatcher#addURI" 
The previous patch (ef23bf19 Allow leading slash in path...) made
a single slash path unmatchable.
To solve it, this patch stops removing a slash character if the path
only has a slash character.
Now, a single slash is a matchable path for a URI without path string.

Bug: 29524484
Change-Id: I90b357aa48be1a3e0cf36e75ed2a9d6532908972
 2016-07-30 01:47:50 +00:00
Makoto Onuki
3b5920b2a1 LauncherApps should also throw when user is locked am: bc4ad85d29 
am: 5ec63fc3c7

Change-Id: Iacb1a0725553ff8e2c205eba8e74d26b19a9a5dd
 2016-07-29 18:38:12 +00:00
Makoto Onuki
bc4ad85d29 LauncherApps should also throw when user is locked 
otherwise it'd be racy.

Bug 30406401

Change-Id: Id6b0295933c5639fa23c56d737a7f0199cbd7497
 2016-07-29 09:40:40 -07:00
TreeHugger Robot
347117f556 Merge "fix javadoc for grantRuntimePermission" 2016-07-29 13:35:19 +00:00
Todd Kennedy
a8eb6a89d6 fix javadoc for grantRuntimePermission 
javadoc and implementation were out of sync.

Change-Id: I53b50ac999134d3f10557cc3b2c3e2586aaa48de
fixes: 30119755
 2016-07-28 16:35:42 -07:00
Makoto Onuki
4830a0c5ca Prevent shortcut access when user is locked am: 9c850012ca am: cab2462e38 
am: 890f85d70f

Change-Id: Ie6653dcc55b37598a45987d938f07ba31e173ef5
 2016-07-28 23:15:16 +00:00
Makoto Onuki
890f85d70f Prevent shortcut access when user is locked am: 9c850012ca 
am: cab2462e38

Change-Id: I66faccf78500d057957fb4a7bc361ff8907811b5
 2016-07-27 22:28:30 +00:00
Makoto Onuki
9c850012ca Prevent shortcut access when user is locked 
Also add some test utility methods that'll be used by CTS.

Bug 30406401

Change-Id: I9396acebbdb3cbe64f6e85877ee62a2131cd6e61
 2016-07-27 12:01:46 -07:00
Makoto Onuki
21e778192d Update ShortcutManager javadoc am: fe9c9669a4 
am: d09c33f32c

Change-Id: I14fdc704a54e4b8e148b9bcd4127cadf7e89eec1
 2016-07-26 20:55:02 +00:00
Makoto Onuki
d09c33f32c Update ShortcutManager javadoc 
am: fe9c9669a4

Change-Id: I4bfaca9ce475e91ec0dae45739b1623ceac8a43c
 2016-07-26 20:50:00 +00:00
Chad Brubaker
90f331adad Merge "Add asUser version of sendBroadcast(Intent, String, Bundle)" 2016-07-26 20:25:43 +00:00
Makoto Onuki
fe9c9669a4 Update ShortcutManager javadoc 
Bug 30359231

Change-Id: I01f1987416fa1ac3f0669afa1f15f88ff2dd1631
 2016-07-25 17:56:09 -07:00
Chad Brubaker
52c8edc2d8 Add asUser version of sendBroadcast(Intent, String, Bundle) 
Change-Id: Id87aa1123d6c0a8a036ed9430eee10357040321f
 2016-07-25 14:30:26 -07:00
Todd Kennedy
7a39181c6c Merge "Implement new ephemeral resolver design" 2016-07-22 22:29:17 +00:00
Todd Kennedy
8653659cbe Merge "Add more tracing" 2016-07-22 14:37:27 +00:00
Makoto Onuki
df4e733bf7 Follow-up to multiple intents support am: 0eed441c0c 
am: b6ed7b7552

Change-Id: I1034eaa7670c7fa983ddffcce295979ec86bde89
 2016-07-22 07:13:17 +00:00
TreeHugger Robot
ddde470652 Merge "Fix undefined fontScale issue in Configuration" 2016-07-22 02:44:35 +00:00
Makoto Onuki
b6ed7b7552 Follow-up to multiple intents support 
am: 0eed441c0c

Change-Id: I3007735db610ddd8c608290ffac8edcdcf390758
 2016-07-22 02:24:00 +00:00
Todd Kennedy
8e2d9d1d90 Implement new ephemeral resolver design 
In the new design, the ephemeral installer can be returned from
queryIntentActivities which means any intent resolution could potentially
return the installer. Additionally, the new design calls for a platform
defined broadcast receiver that receives the status from the ephemeral
installer. This receiver then starts the final intent -- either to launch
the ephemeral application or to launch the fallback.

For more detail, see go/ephemeral-design

Change-Id: I6644bbb4f180d2d22c63af04b9857577516344a9
 2016-07-21 14:55:23 -07:00
Todd Kennedy
cd029da321 Add more tracing 
Allows us to track PackageManagerService startup

Bug: 30272038
Change-Id: I56fa7480fe640f4444d09a657889ec83685a7570
 2016-07-21 13:35:12 -07:00
Makoto Onuki
0eed441c0c Follow-up to multiple intents support 
- More unit tests
 - LauncherApps.startShortcut() now supports sourceBounds
 (again)
- Updated the javadoc.

Bug 30218829

Change-Id: Iae208ffd4911d149246ccfd0c4380544c2aafffc
 2016-07-21 11:33:37 -07:00
Makoto Onuki
de1e6e4d2d Merge \\"Support multiple intents in ShortcutInfo\\" into nyc-mr1-dev am: b84ce2e034 
am: 9a6109f284

Change-Id: I0f1caf54cc544db0b73f8e3275005923904f57a8
 2016-07-20 23:15:32 +00:00
Makoto Onuki
9a6109f284 Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev 
am: b84ce2e034

Change-Id: I53daa680bdf18505896a372e59c7b4bd73d4edca
 2016-07-20 23:09:55 +00:00
Makoto Onuki
440a1ea8e2 Support multiple intents in ShortcutInfo 
Also fix b/30230996.

TODO: Support the sourceBounds argument to LauncherApps.
startShortcut().

Bug 30218829
Bug 30230996

Change-Id: Ibb6c59d5b7c0a320c21d09436d016d0eac94644f
 2016-07-20 14:46:48 -07:00
Adam Lesinski
bad43fcae4 Fix undefined fontScale issue in Configuration 
When using a Configuration object as a delta for use
as an update to an existing Configuration object,
the fontScale property is always defaulted to 1.0, which
is not considered "undefined". That means that fontScale will
always get overridden to 1.0.

This changes the undefined value of fontScale to 0.0, which is
set when the Configuration object is constructed. Thankfully,
the documentation for Configuration states that until
Configuration#setToDefaults() is called, the Configuration is in
an invalid state. That means that apps can not rely on fontScale == 1.0
without calling setToDefaults().

Bug:29924927
Change-Id: I19342c55f7057423f1ca8c5d8dce1dff07617d90
 2016-07-20 20:15:26 +00:00
TreeHugger Robot
c5837520ba Merge "Add per-user versions of set{Component,Application}EnabledSetting." 2016-07-20 18:58:56 +00:00
Sudheer Shanka
0e6bfff6c1 Add per-user versions of set{Component,Application}EnabledSetting. 
Change-Id: Id63b233308e92a4c360f38d4728c519ac2131ff0
Fixes: 30230444
 2016-07-20 10:30:57 -07:00
Makoto Onuki
e1f90ac94a Merge \\"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\\" into nyc-mr1-dev am: ceadb1a86a 
am: c74ed0d6dc

Change-Id: I0c66444e1352af26bf7c039271a5bee952eb5e52
 2016-07-20 00:32:17 +00:00
Makoto Onuki
c74ed0d6dc Merge \"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\" into nyc-mr1-dev 
am: ceadb1a86a

Change-Id: If26f5a2e8f2a0533b145025734e5819e72a48b28
 2016-07-20 00:24:42 +00:00
Makoto Onuki
ceadb1a86a Merge "Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when..." into nyc-mr1-dev 2016-07-19 23:57:32 +00:00
Makoto Onuki
347a6bd820 Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when... 
starting a shortcut.

- Also add API surface to support launching multiple intents

- Also add SM.isRateLimitingActive() which was supposed to be
added but was not due to a bad rebase.

Bug 30218829

Change-Id: I82d60ec0df1e2b889538705f9f8870ee727dd55d
 2016-07-19 11:17:12 -07:00
Nicolas Prévot
77dbac341a Merge \\"Don\\'t append userIds for the current user\\'s clipData uris.\\" into nyc-mr1-dev am: e723ed8b51 
am: 91b6f5e44f

Change-Id: I8e85d2e6df9768a48b5d3589304f60a23c9ab182
 2016-07-19 16:20:14 +00:00
Nicolas Prevot
91b6f5e44f Merge \"Don\'t append userIds for the current user\'s clipData uris.\" into nyc-mr1-dev 
am: e723ed8b51

Change-Id: Idf3bf3c6baea706a15df5e68c50d79723a100d9f
 2016-07-19 16:15:27 +00:00
Nicolas Prévot
e723ed8b51 Merge "Don't append userIds for the current user's clipData uris." into nyc-mr1-dev 2016-07-19 16:06:44 +00:00
Adam Lesinski
8024bf723c Merge \\"Deprecate Resources constructor and updateConfiguration() method\\" into nyc-mr1-dev am: c3829f528e 
am: 6a9f651b73

Change-Id: I27261451c872502b5f240f1e68fdd092fa9e5e67
 2016-07-16 02:44:06 +00:00
Adam Lesinski
6a9f651b73 Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev 
am: c3829f528e

Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6
 2016-07-16 02:38:24 +00:00
TreeHugger Robot
c3829f528e Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev 2016-07-16 02:33:55 +00:00
Adam Lesinski
aa19d5e49e Deprecate Resources constructor and updateConfiguration() method 
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().

Bug:30088019
Bug:29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
 2016-07-15 18:01:48 -07:00
Makoto Onuki
d36651717e Merge \\"Cache the default launcher.\\" into nyc-mr1-dev am: cf99263662 
am: 6406be311c

Change-Id: If7d3f5325388242a196d78f8429c4aba65ef041e
 2016-07-15 23:34:53 +00:00
Makoto Onuki
35dcfebd1e Merge \\"Fix the allowed icon type error message\\" into nyc-mr1-dev am: fd57d549cf 
am: 3e3f0f1ba8

Change-Id: Iaa3eb26436dfa339ee7e095562344394dcd56b53
 2016-07-15 23:28:20 +00:00
Makoto Onuki
6406be311c Merge \"Cache the default launcher.\" into nyc-mr1-dev 
am: cf99263662

Change-Id: If8d15587702dad81d9a9025e13dec9820456287b
 2016-07-15 22:26:15 +00:00
Makoto Onuki
cf99263662 Merge "Cache the default launcher." into nyc-mr1-dev 2016-07-15 22:22:34 +00:00