Commit Graph

4513 Commits

Author SHA1 Message Date
Etan Cohen
6571007101 Merge "[NAN-AWARE] Rename NAN to Aware"
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
2016-11-06 03:13:31 +00:00
Etan Cohen
0849ded008 [NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!

Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.

(cherry-pick of commit a61b9fb569)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
2016-11-05 09:41:38 -07:00
Dianne Hackborn
50468217c4 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7
am: 9774ea3646

Change-Id: I7e27381f7fa4ca8770ca06cdc6c0bdd18a549ae2
2016-10-13 20:38:04 +00:00
Dianne Hackborn
851ec49de7 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle
We now recursively generate new Bundle objects if we need to
do any stripping.

Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
2016-10-12 18:17:58 -07:00
Chet Haase
3267a2462d Fix small typo in ShortcutManager header docs am: c158431f8e
am: 5aa0dfcc0a

Change-Id: Ia3a1a14cf561e6846245fa8265e96e954d8a185d
2016-10-12 00:31:31 +00:00
Chet Haase
c158431f8e Fix small typo in ShortcutManager header docs
Bug: 32093275 fix typo in ShortcutManager javadocs
Test: no test, just words in the header docs
Change-Id: Icd33481a7f285686429d908cf92de0f6f886f962
2016-10-11 21:48:55 +00:00
Kevin Hufnagle
cf7a2e1efd docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. am: e9681e192a
am: ba65a92855

Change-Id: Ia3fc2e6cfc85269a04a721d7c6fe14e04555a121
2016-09-27 00:03:58 +00:00
Kevin Hufnagle
e83639f66a docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. am: e9681e192a
am: 2e8026acc0

Change-Id: I93a1abe6b80a441f8c441390dacbff2824d52e57
2016-09-27 00:02:44 +00:00
Kevin Hufnagle
ffafee82cd docs: Removed all instances of "i.e." in IntentFilter parameter descriptions. am: e20b3d78e3
am: e0360165d3

Change-Id: I02e413c1dbf2cfe684a0b73aafd7075b4db4c090
2016-09-27 00:02:16 +00:00
Kevin Hufnagle
abfc0340d7 docs: Removed all instances of "i.e." in IntentFilter parameter descriptions. am: e20b3d78e3
am: 9402b319fe

Change-Id: Id7d4b705073802abcb2d902b50673a09933ff3da
2016-09-27 00:01:00 +00:00
Kevin Hufnagle
2e8026acc0 docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB.
am: e9681e192a

Change-Id: Ide8f3c2dd5414737c798c20c1fe9f11dcd9640ce
2016-09-26 23:36:25 +00:00
Kevin Hufnagle
ba65a92855 docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB.
am: e9681e192a

Change-Id: I4d84c62b039746cd70c74a0bc9edbffc6df3a44c
2016-09-26 23:35:11 +00:00
Kevin Hufnagle
9402b319fe docs: Removed all instances of "i.e." in IntentFilter parameter descriptions.
am: e20b3d78e3

Change-Id: I8d677ebcf03c28f46874514408240162cd6331c5
2016-09-26 23:34:58 +00:00
Kevin Hufnagle
e0360165d3 docs: Removed all instances of "i.e." in IntentFilter parameter descriptions.
am: e20b3d78e3

Change-Id: I37821ca96243491cf642a58475dd96e5e7b52962
2016-09-26 23:33:43 +00:00
Kevin Hufnagle
978be65ce7 docs: Fixed example of ACTION_VIEW intent am: aedfd75b1b
am: 108623004f

Change-Id: I7efbc417f5cd7ebfa8a6e19d110a742a22bdd465
2016-09-26 23:17:11 +00:00
Kevin Hufnagle
ee3fc61cf9 docs: Fixed example of ACTION_VIEW intent am: aedfd75b1b
am: 2c885fc5ea

Change-Id: I1d94ee6938726736d6cbccafea848dd6f3d6a350
2016-09-26 23:16:02 +00:00
Kevin Hufnagle
2c885fc5ea docs: Fixed example of ACTION_VIEW intent
am: aedfd75b1b

Change-Id: Iaaaa1cb0f6d796ad5c5c178c70850fd83e635013
2016-09-26 23:00:51 +00:00
Kevin Hufnagle
bec2e99f95 docs: Adjusted return value desc. for getApplicationEnabledSetting am: 5add769f59
am: d23fc43965

Change-Id: I27847f0935c047e74ab986c501fce160679a80d7
2016-09-26 23:00:16 +00:00
Kevin Hufnagle
108623004f docs: Fixed example of ACTION_VIEW intent
am: aedfd75b1b

Change-Id: I2ac1bd94b7cacc2b1aaed6caf2f7044db5a892c6
2016-09-26 22:59:37 +00:00
Kevin Hufnagle
5ca3c61069 docs: Adjusted return value desc. for getApplicationEnabledSetting am: 5add769f59
am: 1fb3dec4be

Change-Id: I0137a54c007b590891486fbb5a4c167b2fd52961
2016-09-26 22:56:36 +00:00
Kevin Hufnagle
d23fc43965 docs: Adjusted return value desc. for getApplicationEnabledSetting
am: 5add769f59

Change-Id: Ic0566aa6e2764a9d0db58c6f66ad028229a8fdca
2016-09-26 22:52:54 +00:00
Kevin Hufnagle
1fb3dec4be docs: Adjusted return value desc. for getApplicationEnabledSetting
am: 5add769f59

Change-Id: Ibffca6373a01e74bc25a4f44afbc7c4463810124
2016-09-26 22:46:08 +00:00
Kevin Hufnagle
e9681e192a docs: Added note in getCacheDir() that developers can use directory
obtained from getExternalCacheDir() to store app caches larger than
1 MB.

Bug: 22505268
Change-Id: I9972ba5ef7b43a135c00ac48a2e5ccb1fcc5b103
2016-09-23 16:44:03 -07:00
Kevin Hufnagle
e20b3d78e3 docs: Removed all instances of "i.e." in IntentFilter parameter
descriptions.

Bug: 5877117
Change-Id: Iccb16589a72d3180330f13ec224578a0c5ad81c6
2016-09-22 18:33:57 -07:00
liulvping
9eadea585c Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46d6 am: 506bf0741a
am: 5f4f8d2441

Change-Id: Iedcf57ee7856fb9abac459230e686a351370543d
2016-09-13 21:15:51 +00:00
liulvping
5f4f8d2441 Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46d6
am: 506bf0741a

Change-Id: I0ec538fc78a512441517d1205ac3d34232ce992e
2016-09-13 21:10:22 +00:00
Svet Ganov
c78be8772a [DO NOT MERGE] Don't show account access request UI until app launched. am: d63cde7ba4
am: 99d29ddf42

Change-Id: I1e6977d2478bf695d9840a72cba6e0e1b600b1e6
2016-09-10 01:01:50 +00:00
Svet Ganov
99d29ddf42 [DO NOT MERGE] Don't show account access request UI until app launched.
am: d63cde7ba4

Change-Id: I06a6b98c9c4a1cd67ed155d42cf4fe5149015675
2016-09-10 00:54:43 +00:00
Svetoslav Ganov
32ce3c8797 Merge "[DO NOT MERGE] Don't show account access request UI until app launched." into nyc-mr1-dev 2016-09-10 00:36:21 +00:00
Svet Ganov
d63cde7ba4 [DO NOT MERGE] Don't show account access request UI until app launched.
Sync adapters that don't have account access cannot run until
the user explicitly approves in the UI. This is spammy given
the user may not use the app right away. This change doesn't
show the notificaiton until the app has run.

bug:31162498

Change-Id: I1f4f2d2e9426f78763590e8aa542b94d6e93e488
2016-09-09 15:13:07 -07:00
Todd Kennedy
792cac6fd6 Add filter ordering am: c2e96d45d2
am: cdda4eed12

Change-Id: I6c4782393a5f694cba8238a05e60939169bd464f
2016-09-09 20:08:58 +00:00
Todd Kennedy
cdda4eed12 Add filter ordering
am: c2e96d45d2

Change-Id: I9bc8994293a45684238c7d1377d30ef8c049ce81
2016-09-09 20:04:30 +00:00
TreeHugger Robot
295f5108f1 Merge "Add filter ordering" into nyc-mr1-dev 2016-09-09 19:59:46 +00:00
Kevin Hufnagle
aedfd75b1b docs: Fixed example of ACTION_VIEW intent
The ACTION_VIEW intent contained a content path that was inconsistent
with each of the other examples on the Intent reference page. Added
the "people" directory to the content path to remedy this issue.

Bug: 26405268
Change-Id: Ieb4f67e072338a108b9775d3bafad3d0773533d2
2016-09-08 21:56:25 -07:00
Svet Ganov
7580351e9e [DO NOT MERGE] While-list apps to access account if already saw it am: 91d37f43c7
am: f56f70365d

Change-Id: I3a553a7efe34feb9fbfa5d5c504874a2780bf132
2016-09-09 02:42:23 +00:00
Svet Ganov
91d37f43c7 [DO NOT MERGE] While-list apps to access account if already saw it
Sync adapters without an account access cannot run until the
user approves the account access (for the case the account
access is not allowed by other policy such as being singed
with the same cert as the authenticator). However, if the
sync adapter package already got the account from another
app which means it already saw the account we white-list
the sync adapter app to access the account as it already
saw it - the bird is out of the cage.

bug:31162498

Change-Id: I2b72f3b0d6307561ed68db2f2e9c900b15e8d098
2016-09-08 16:46:46 -07:00
Todd Kennedy
c2e96d45d2 Add filter ordering
Filter ordering allows automatic disambiguation between multiple filters
that matching a pattern. Ordering currently only works for EphemeralResolveInfo
objects.

Bug: 30837021
Change-Id: Ia217218c7c7d159dbd75d7733c45556e690d06d2
2016-09-08 15:34:03 -07:00
liulvping
bf76ee74c7 fix NullPointerException in RegisteredServicesCache
https://code.google.com/p/android/issues/detail?id=221932

Change-Id: I67c0b799d10f4b9c8fa0779069d23cc49916b395
Signed-off-by: liulvping <liulvping@xiaomi.com>
2016-09-08 01:20:34 +00:00
Andreas Gampe
2a04b0876f Frameworks/base: Add new flow to OtaDexoptService am: d15300cf38
am: 32a092adf3

Change-Id: I7a49f0732cf24c2a86f798c6725a664e93092d7b
2016-09-06 21:25:36 +00:00
Andreas Gampe
82f8ebc2b7 Otadexopt: Expose progress percentage am: ff8ab4c9fa
am: 630a372a1d

Change-Id: I25937bf6a90076b37c5c322ccc8335fef3a9e6ee
2016-09-06 21:25:32 +00:00
Andreas Gampe
d15300cf38 Frameworks/base: Add new flow to OtaDexoptService
Add functionality to capture/intercept installd communication, and
use this to return the full communication for dexopt. These parameters
can be used to drive otapreopt_chroot directly.

Keep the old direct invocation alive until devices have transitioned
to a service that exposes this API.

In preparation for renaming of A/B OTA artifacts to include target
slot names.

Bug: 25612095
Bug: 28069686
Change-Id: I14728ee1266f3882cada8f08dd21891ed5f7a0cb
(cherry picked from commit cc241a580c)
2016-09-06 10:39:56 -07:00
Andreas Gampe
ff8ab4c9fa Otadexopt: Expose progress percentage
To be able to report progress of an A/B OTA dexopt, expose a
progress function that the script can query.

Bug: 25612095
Bug: 29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
(cherry picked from commit bf06232f4d)
2016-09-06 10:39:20 -07:00
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
Kevin Hufnagle
5add769f59 docs: Adjusted return value desc. for getApplicationEnabledSetting
The return value now references ApplicationInfo instead of
ComponentInfo.

Bug: 18123642
Change-Id: I595befe62dbce997becb689362abe5e4483b82c4
2016-08-29 16:50:17 -07: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
TreeHugger Robot
80855e154e Merge "Implement new ephemeral resolver design" into nyc-mr1-dev 2016-08-26 20:28:04 +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