Commit Graph

3485 Commits

Author SHA1 Message Date
Steve Pomeroy
1276b5f29e ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2016-05-12 21:18:15 +00:00
Hans Boehm
fb9f6acd6f Improve grammar in startService() documentation.
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
2016-05-05 13:09:28 -07:00
Bill Yi
2528fcdfbd Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD
Change-Id: Ifc45930160cf01ee78ecfbfdc48697055f82e0a7
2016-02-17 11:38:55 -08:00
Yoshinobu Ito
c52adfe124 Implementation of HCE for NFC-F.
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.

Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
               Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>

Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
2016-01-22 18:14:18 +09:00
Todd Kennedy
0271416563 Merge "Update PackageInstaller install handing"
am: 47950e588c

* commit '47950e588c59ff58d12b3429d285e3330b9dfe01':
  Update PackageInstaller install handing
2016-01-08 18:11:33 +00:00
Todd Kennedy
819d2745b4 Update PackageInstaller install handing
* Allow forcing permission check. We want to modify the PackageInstaller to
use the PackageInstallerSession for better security / remove deprecated APIs.
In order to do this and continue to prompt for permissions, we need to prevent
the PakcageInstaller from auto-approving the permissions.

* Add originating UID to SessionParams. This is used for package verifier
checks.

Bug: 22282121
Change-Id: I19079749d20ace66f1332f399d52cb0fb8784cd9
2016-01-07 13:51:16 -08:00
Narayan Kamath
f59c02a65e Merge changes from topic \'aosp-merge-24-12\'
am: e0e81bf407

* commit 'e0e81bf407508ec096c752948f8794af5fd480ca':
  Special case system_server to not create the JIT code cache.
  Don't use IntegralToString
  Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.
  Track API changes to java.lang.ref.Reference.
  Remove merge markers from preloaded-classes
  Move StrictJarFile from libcore to framework
  Switch RecoverySystem impl to use sun.security.pkcs
  API update for OpenJdk based libcore
  Use libcore/known_oj_tags for the javadoc stage.
  Stop preloading fortress classes
  Use HexDump instead of java.lang.IntegralToString
  Add core-oj to the list of core library jars.
2015-12-24 04:07:42 -08:00
Przemyslaw Szczepaniak
6a8ad6d161 Move StrictJarFile from libcore to framework
Bug: 25337946

(cherry picked from commit 8a7c1606d8)

Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee
2015-12-22 13:10:55 +00:00
Przemyslaw Szczepaniak
e69a31d750 Use HexDump instead of java.lang.IntegralToString
java.lang.IntegralToString is being removed, replaced
all its usage by com.android.internal.util.HexDump.

(cherry picked from commit 3f72604be8)

Change-Id: I0527d580f5975dca0dfaa6f86fa3695dd49d0849
2015-12-22 13:10:55 +00:00
Jeff Sharkey
a9c2218940 Merge "Avoid a double decrease of reference counter for unstable provider" am: e8651aed4b
am: aae0a49c16

* commit 'aae0a49c164e9eeb19d46967c84697cd1a3a6783':
  Avoid a double decrease of reference counter for unstable provider
2015-12-03 17:16:30 +00:00
Jeff Sharkey
aae0a49c16 Merge "Avoid a double decrease of reference counter for unstable provider"
am: e8651aed4b

* commit 'e8651aed4b8a2c6703589069e26f5be750b2a947':
  Avoid a double decrease of reference counter for unstable provider
2015-12-03 17:07:50 +00:00
Jeff Sharkey
e8651aed4b Merge "Avoid a double decrease of reference counter for unstable provider" 2015-12-03 16:59:58 +00:00
Jeff Sharkey
07c6628d68 Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev am: a975732a83 am: 637d05eb5c
am: d359137d41

* commit 'd359137d419023f207351251cdbfa23180236963':
  Handle "uninstalled" apps when pruning app-ops.
2015-10-30 21:59:36 +00:00
Jeff Sharkey
637d05eb5c Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev
am: a975732a83

* commit 'a975732a8302893a40cdc444f893bf09b7669173':
  Handle "uninstalled" apps when pruning app-ops.
2015-10-30 21:37:17 +00:00
Anthony Hugh
c2b3e48bb1 Merge "Add intent extra for determining if apps are system apps" into cw-e-dev am: 3a9bf5c8ce
am: a8e20b3919

* commit 'a8e20b391909cbc115e8996bd247e84a2819bfc3':
  Add intent extra for determining if apps are system apps
2015-10-30 20:19:36 +00:00
Jeff Sharkey
e2ed23e6b2 Handle "uninstalled" apps when pruning app-ops.
During system boot, we prune app-ops belonging to apps that have
been uninstalled.  However, apps installed on adopted storage devices
haven't been scanned at this point, so they appear to be uninstalled.

To avoid pruning app-ops for these apps, we need a getPackageUid()
variant that also considers "uninstalled" apps for which we still
have PackageSetting values.

Bug: 25206071
Change-Id: I1820f674d45c5ddc1c5f10ed7d859e7025005e28
2015-10-29 19:04:15 -07:00
Anthony Hugh
3575a40009 Add intent extra for determining if apps are system apps
This is being added to help identify system apps so that
the UI can filter on that type.

BUG: 24955055
Change-Id: Ie4be3717ce997f60eeb48a389c0f54ce5803141a
2015-10-26 17:47:05 -07:00
Jeff Sharkey
6dee8faff3 Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6 am: 257d2ca7fd
am: e01b99faa5

* commit 'e01b99faa54a083ae7b10db902a03f4aa6c9bd63':
  Correctly derive ABI for apps on adopted media.
2015-10-21 01:15:29 +00:00
Jeff Sharkey
257d2ca7fd Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev
am: 55d2b6e8e6

* commit '55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456':
  Correctly derive ABI for apps on adopted media.
2015-10-21 00:55:05 +00:00
Jeff Sharkey
55d2b6e8e6 Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev 2015-10-21 00:48:47 +00:00
Jeff Sharkey
bbcb331205 Correctly derive ABI for apps on adopted media.
There was a bug causing PackageManager to think apps on adopted media
were actually in an ASEC, causing it to skip ABI derivation.  This
change fixes the issue by copying the volume UUID into place early
in the scanning process.

Also fixes two places where we had incorrectly been including apps
on adopted media; switched them to check only for ASECs.

Bug: 24583803
Change-Id: If66d1bce02824a4d8e22f741b04a2abda0378cfb
2015-10-20 17:32:05 -07:00
Matthew Williams
c31529097d DO NOT MERGE Sync extras bundle comparison can throw NPE am: 7d7a2254bc am: cb937cbc6a
am: d7d56a4feb

* commit 'd7d56a4feb5502e17dea4ebb4c9b22347be2b7d3':
  DO NOT MERGE Sync extras bundle comparison can throw NPE
2015-10-20 21:06:31 +00:00
Matthew Williams
cb937cbc6a DO NOT MERGE Sync extras bundle comparison can throw NPE
am: 7d7a2254bc

* commit '7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a':
  DO NOT MERGE Sync extras bundle comparison can throw NPE
2015-10-20 20:42:07 +00:00
Rob Carr
2d021f9f48 Merge "Correct ActivityInfo constructors." into mnc-dr-dev am: cfea184d6c am: e2a49862c1
am: 8caf80d571

* commit '8caf80d571c37bc6fefd68227432fd49d76aaa93':
  Correct ActivityInfo constructors.
2015-10-20 19:26:38 +00:00
Matthew Williams
7d7a2254bc DO NOT MERGE Sync extras bundle comparison can throw NPE
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033)
2015-10-20 18:55:30 +00:00
Rob Carr
e2a49862c1 Merge "Correct ActivityInfo constructors." into mnc-dr-dev
am: cfea184d6c

* commit 'cfea184d6c0268b92ed55276d2b686962c8ee531':
  Correct ActivityInfo constructors.
2015-10-20 18:33:58 +00:00
Robert Carr
8ab115a9aa Correct ActivityInfo constructors.
ActivityInfo was missing initialization for the
documentLaunchMode flag in the copy-constructor
and the Parcel constructor. The copy-constructor
is used in multi-user/profile mode to create a
seperate instance of the ActivityInfo per uid
and this was manifesting in the linked bug.

Bug: 21590916
Change-Id: I6f71d94ec32ec6326d23c9b62e9d8d319e2fa25e
(cherry picked from commit 3e2e011785)
2015-10-20 17:48:11 +00:00
Koji Fukui
f783c02c61 Avoid a double decrease of reference counter for unstable provider
In some APIs unstable provider is released twice.
Unexpected release of unstable provider makes the reference counter
for unstable provider invalid state and it causes application crash.

This change avoids unexpected double decrease of reference counter
for unstable provider by setting null to prevent extra release
in finally block.

Change-Id: Ie2985c316ffcb6a9db7570c46347035c24d226af
2015-10-19 14:22:45 +09:00
Jeff Sharkey
de0b34ea14 am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
* commit 'd56756fdee9fce3d08bea769710d7173bcbc263a':
  Update docs to reflect adoptable behavior.
2015-10-16 16:38:29 +00:00
Jeff Sharkey
535726f637 am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
* commit '0c15693e8de6f89fab7ca3d582f0a8605a54df9f':
  Update docs to reflect adoptable behavior.
2015-10-16 16:25:38 +00:00
Jeff Sharkey
59d28dc820 Update docs to reflect adoptable behavior.
Update storage related docs on Context to be consistent, and to call
out relevant Environment methods.  Start calling it "shared" storage,
and only mention external for historical reasons.  Mention that there
isn't much benefit to using emulated storage over private data
directories to help guide developers to safer locations.

Point out which paths can change over time, so developers know to
only persist relative paths.

Update Environment docs to reflect how they behave for the new
class of adopted storage devices.

Bug: 24251945
Change-Id: Ie5ab337649b4740dfd7594997bbb19c4969cfd2f
2015-10-14 14:41:23 -07:00
Anthony Hugh
66940eaaab am 073a1624: am 6b566ec5: Merge "Give Android Wear system apps default permission" into cw-e-dev
* commit '073a1624912a93da65b5e40b6ff434c4fd3ab0f2':
  Give Android Wear system apps default permission
2015-10-09 18:36:42 +00:00
Anthony Hugh
979b81ac33 Give Android Wear system apps default permission
This change grants Android Wear system components default
permission.

I have also added a new Intent category to help identify
the main Home handler on Wear.

BUG: 23419042
Change-Id: Ie669a9908bd3b03498f75c5ca22c0fddf52a5203
2015-10-08 16:34:28 -07:00
Bryce Lee
979a22eaf9 am 6ad696c3: am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
* commit '6ad696c35b80f70f19de304b53bdbfc6f5a265d8':
  Add ThermalObserver system service to capture thermal state uevents.
2015-09-26 06:55:22 +00:00
Bryce Lee
bc58f59da6 Add ThermalObserver system service to capture thermal state uevents.
Bug: 21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
2015-09-25 16:43:01 -07:00
Fyodor Kupolov
fd464a301f am 71b4b738: am d20f2106: am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
* commit '71b4b738a611565659df33fe56635d75a25e6f19':
  Use app directory as apkPath for cluster installs
2015-09-16 21:19:57 +00:00
Fyodor Kupolov
d20f210650 am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
* commit 'bfc584df683a84dffd8e04b7b13f619606a0a42a':
  Use app directory as apkPath for cluster installs
2015-09-16 21:02:53 +00:00
Vinod Krishnan
f274e3252b am aae9c4ab: am 74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev
* commit 'aae9c4ab35ac98e8106d6a57d9d094780fbb0189':
  Add some constants for Wear MNC Perms
2015-09-14 22:36:29 +00:00
Vinod Krishnan
74c3a0e7b4 Merge "Add some constants for Wear MNC Perms" into cw-e-dev 2015-09-14 22:23:25 +00:00
Alex Hills
d04c6d19a5 resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp
Change-Id: I701841759a80f434a09b086492e817ca23a6a2e6
2015-09-14 17:03:58 -04:00
Vinod Krishnan
61665cc4ae Add some constants for Wear MNC Perms
- Add an API for getting list of apps that has runtime perms

Change-Id: I4ebfc01033ea96efaac062fd34982fbd0d081073
2015-09-14 13:16:18 -07:00
Alan Viverette
3d2337eeb5 Cherry-pick system theme rebase to fix square UI on round watches
Our system themes were based on configurations that were added post-
init of the system theme.

I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes

If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.

This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.

Bug:23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
2015-09-14 10:56:02 -04:00
Fyodor Kupolov
ebcac16cb1 Use app directory as apkPath for cluster installs
Previously, size of of oat directory was not counted by the getsize command,
because base APK location was passed as apkpath argument.

Bug: 23896047
Change-Id: Ic7b6b725785ff2e2a0cf3887ba68c162b23b1212
2015-09-10 10:44:49 -07:00
Nick Kralevich
712205bac0 am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"."
* commit '9d586927102b597845607ccc82661e350821de82':
  Automatically assign default seinfo labels using the string "default".
2015-09-01 16:37:59 +00:00
Robert Craig
5e16bc5a14 Automatically assign default seinfo labels using the string "default".
default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?

Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.

Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2015-09-01 05:51:04 -04:00
Fyodor Kupolov
950297d27f am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
* commit 'e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-21 23:12:14 +00:00
Fyodor Kupolov
e6c64508ab Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 2015-08-21 23:04:09 +00:00
Fyodor Kupolov
7d35fc3898 Fixed a typo in convertRestrictionsToBundle JavaDoc
Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
2015-08-21 11:25:55 -07:00
Fyodor Kupolov
8a363bb13d am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
* commit '1773ded84684593f459b19f3271d471b38f14f85':
  Fixed key comparison in equals method
2015-08-20 19:56:02 +00:00
Fyodor Kupolov
1af7a83939 Fixed key comparison in equals method
Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d
2015-08-20 10:24:14 -07:00