Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
269,531 Commits 3 Branches 0 Tags
7af650876600a9ba2a2d2fa0ebf419827a52e4fa
Commit Graph

4469 Commits

Author SHA1 Message Date
Mitchell Wills
722de5f9d0 DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp 
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
 2016-08-29 17:46:44 -07:00
The Android Automerger
f287780643 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp 2016-08-30 00:26:21 +00:00
Etan Cohen
b0214c4cd5 [NAN] Udpate NAN API documentation, clean-up visibility 
Change-Id: I951340eebab35c10efe98dab86b58fe8efada169
(cherry picked from commit 2e37b06dde)
 2016-08-29 11:26:55 -07:00
Todd Kennedy
3b0859d6bb Implement new ephemeral resolver design am: fea1b776e9 
am: 6485f6eddf

Change-Id: I2bca8e38da973a0a1e7d5d11b5d094dc0188cc40
 2016-08-26 20:43:26 +00:00
Todd Kennedy
6485f6eddf Implement new ephemeral resolver design 
am: fea1b776e9

Change-Id: Ied8a583de6247a5d826805dfbb5e8edbecdcdb27
 2016-08-26 20:32:45 +00:00
Paul Stewart
163a135246 Document correct context for obtaining WifiManager am: 0e164b199e 
am: b09557b3cf

Change-Id: I792d164a20e2e98fc58b54bab4f1f43e1eb2fe59
 2016-08-26 18:01:53 +00:00
Paul Stewart
0e164b199e Document correct context for obtaining WifiManager 
Added comments to both WifiManager WIFI_SERVICE.

Bug: 25015174
Change-Id: Ibd1e21d860ef2b7cc432b3da76671d22c02ef7cb
 2016-08-26 09:27:04 -07:00
Mark Lu
2721e7db4a docs: fix link in Loader reference page am: 9f52b7a4a8 
am: c6612637bb

Change-Id: I0472093b0019a421319c2acf29a4e36b87e75cd6
 2016-08-26 01:15:49 +00:00
Mark Lu
e16c82d224 docs: fix link in Loader reference page am: 9f52b7a4a8 
am: f496b9a981

Change-Id: I7a7ee695fadb2e0774ef84724a4320fc73b45a88
 2016-08-26 01:03:56 +00:00
Mark Lu
c6612637bb docs: fix link in Loader reference page 
am: 9f52b7a4a8

Change-Id: I98f4ca957005ffc795e41be321b6b4995c6242f0
 2016-08-26 01:02:36 +00:00
Mark Lu
f496b9a981 docs: fix link in Loader reference page 
am: 9f52b7a4a8

Change-Id: I32164f55f9b42dc50f13756c942644350a7d643e
 2016-08-26 00:53:53 +00:00
Fyodor Kupolov
44811aba74 Update services info before returning authenticators am: 814464894c am: 7540b79fee 
am: 69192b00e6

Change-Id: I4615e7480647b1d15d6e083f11e21acb4dbfefc6
 2016-08-25 00:21:11 +00:00
Fyodor Kupolov
7540b79fee Update services info before returning authenticators 
am: 814464894c

Change-Id: I3d7eb42ef73ad77cb44c251a493ae967bcc0f651
 2016-08-25 00:08:38 +00:00
Fyodor Kupolov
814464894c Update services info before returning authenticators 
Added RegisteredServicesCache.updateServices method which allows callers
to request an update to services for which package has been updated.

Added a call to updateServices in getAuthenticatorTypesInternal

Test: Manually tested update flow on test authenticator with an artificial
      delay in broadcast handling
Bug: 30979262
Change-Id: I499b2ee0be53fed01201c56068d929b6d621a78e
 2016-08-24 22:47:38 +00:00
Svetoslav Ganov
eeeebd346a Only sync adapters with access can see an account - framework am: 5cb2973495 
am: 721402e75a

Change-Id: I361b009afa6c6e658157e6e04bf88096e8331fd0
 2016-08-24 02:08:19 +00:00
Svetoslav Ganov
5cb2973495 Only sync adapters with access can see an account - framework 
It was possible for a sync adapter without accounts access to
see the account which it is supposed to sync which can be used to
identify the user. This change ensures that only sync adapters
with account access can run (which results in seeing the account),
otherwise we involve the user to approve access only to this account.

A sync adapter can access an account if one of these is true:
 - it is signed as the authenticator for this account
 - has the GET_ACCOUNTS permission
 - has an auth token for the account
 - it is a preinstalled app (system or privileged)

The main thing we need to figure out is if the extra prompts
for giving access to a sync adapter to the account create too
much friction.

bug:28163381

Change-Id: Ie083bb681b5a2aed81ca5f6a062193a175fad77e
 2016-08-23 21:43:27 +00:00
Todd Kennedy
ef8d8ea24a No need to check package name 
Change-Id: I8c403ca2bc38f2c7191b6e9a709286ac7e450ac4
Fixes: 30958291
(cherry picked from commit afb5269ad6)
 2016-08-23 17:09:52 +00:00
Todd Kennedy
8860c34b32 No need to check package name am: afb5269ad6 
am: b9de7e33a3

Change-Id: If2b7a9bdf2a3cb5ae05049916596087606e8a01b
 2016-08-23 16:56:16 +00:00
Todd Kennedy
fea1b776e9 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

Bug: 30805203
Bug: 30273584
Change-Id: I6644bbb4f180d2d22c63af04b9857577516344a9
(cherry picked from commit 8e2d9d1d90)
 2016-08-22 16:09:13 -07:00
Todd Kennedy
afb5269ad6 No need to check package name 
Change-Id: I8c403ca2bc38f2c7191b6e9a709286ac7e450ac4
Fixes: 30958291
 2016-08-22 15:47:22 -07:00
Mark Lu
9f52b7a4a8 docs: fix link in Loader reference page 
Bug: 29764129
Change-Id: I5ca881bb30adbbaf65ba37b1cf63903a4fc5600e
 2016-08-12 15:48:05 -07:00
Mark Lu
82a7343653 docs: add info to SharedPreferences.Editor.putString am: fb48521f41 
am: f434456ba5

Change-Id: I5dec6b6fb20c741d92a840cf6291d0b33ac46d5a
 2016-08-08 22:49:12 +00:00
Mark Lu
9bc63b9bf0 docs: add info to SharedPreferences.Editor.putString 
am: fb48521f41

Change-Id: I948c8091a70180e29a601d6cba40d7fb0cf2d76a
 2016-08-08 22:49:08 +00:00
Mark Lu
f434456ba5 docs: add info to SharedPreferences.Editor.putString 
am: fb48521f41

Change-Id: Icf8a1a92e8f18bcc63b52842ea75b00610feac9d
 2016-08-08 22:36:09 +00:00
Mark Lu
fb48521f41 docs: add info to SharedPreferences.Editor.putString 
The information explains what happens when null is passed
as value parameter

Bug: 24696308
Change-Id: I362c2b1885e882312d1b4b2ff829f8f9f3546301
 2016-08-02 12:10:48 -07:00
Makoto Onuki
88870a84ed LauncherApps should also throw when user is locked am: 02f338e23d 
am: 897a4f84d0

Change-Id: I0e2112d5c638ddf11a51f004eec2b533acd2251b
 2016-08-02 18:15:18 +00:00
Makoto Onuki
02f338e23d LauncherApps should also throw when user is locked 
otherwise it'd be racy.

Bug 30406401

Change-Id: I953eb6ae58e029d254d9fdbd5d05a0090b8d2391
 2016-08-01 18:15:47 -07: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
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
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
d09c33f32c Update ShortcutManager javadoc 
am: fe9c9669a4

Change-Id: I4bfaca9ce475e91ec0dae45739b1623ceac8a43c
 2016-07-26 20:50:00 +00:00
Makoto Onuki
fe9c9669a4 Update ShortcutManager javadoc 
Bug 30359231

Change-Id: I01f1987416fa1ac3f0669afa1f15f88ff2dd1631
 2016-07-25 17:56:09 -07:00
Makoto Onuki
b6ed7b7552 Follow-up to multiple intents support 
am: 0eed441c0c

Change-Id: I3007735db610ddd8c608290ffac8edcdcf390758
 2016-07-22 02:24:00 +00: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
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
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 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
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