Commit Graph

3456 Commits

Author SHA1 Message Date
fionaxu
99973d9852 DO NOT MERGE revert system api loadSafeLabel
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
2016-06-30 17:57:46 -07:00
fionaxu
698e044717 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
am: 965084dd0c

Change-Id: I1db27bacdfc0c66ddc28c3d656f1f5cfb98894a8
2016-06-08 17:11:49 +00:00
fionaxu
965084dd0c resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
am: 1e8fe12f4e

Change-Id: I3122c1d81dde1088990bcbd2aff7eea478ead4fc
2016-06-08 17:04:09 +00:00
fionaxu
c196526f8e resolve merge conflicts of 2c53526 to lmp-mr1-dev
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
2016-06-07 22:01:19 -07:00
fionaxu
2c53526b4b Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
am: 9a825b0fd5

Change-Id: Ie3042058420fbd3018ae238dab4129de58ec69c8
2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5 Backport loadSafeLabel changes am: be2865a60a
am: 4c50846519

Change-Id: Ia31592def4d88a3a9e92a7e0c9126691c64a5fc4
2016-06-07 23:20:04 +00:00
fionaxu
4c50846519 Backport loadSafeLabel changes
am: be2865a60a

Change-Id: Ifabe996449c534c5085245c4f07e2d865a23e126
2016-06-07 23:13:08 +00:00
fionaxu
be2865a60a Backport loadSafeLabel changes
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
2016-06-07 22:51:28 +00:00
Todd Kennedy
ca133845ef DO NOT MERGE Fix intent filter priorities am: 60351d3
am: 3dfc6d9

* commit '3dfc6d986f6142b1e0020c9970f626c7c435711e':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Id396cca79db8f830a513746f387fb866c773c778
2016-04-11 22:06:38 +00:00
Todd Kennedy
3dfc6d986f DO NOT MERGE Fix intent filter priorities
am: 60351d3

* commit '60351d3be29977dfe0b422de797a0429edf500b7':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7
2016-04-11 22:00:27 +00:00
Todd Kennedy
60351d3be2 DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

NOTE: I had to bring in pieces of ag/526831 so intent filters could
be collected and matched

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-07 16:40:18 -07:00
Todd Kennedy
eeb970ada1 DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-05 13:56:59 -07:00
Todd Kennedy
d6174e7402 DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-05 10:20:41 -07:00
Matthew Williams
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 18:14:32 +00:00
Matthew Williams
06ef7dfdf0 DO NOT MERGE Redact Account info from getCurrentSyncs
am: a5cafd2a93

* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
  DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 18:07:55 +00:00
Matthew Williams
a5cafd2a93 DO NOT MERGE Redact Account info from getCurrentSyncs
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698)
2016-01-21 14:15:11 +00:00
Matthew Williams
0f292147f3 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e
am: a947baa87c

* commit 'a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
  Redact Account info from getCurrentSyncs
2016-01-20 11:51:42 +00:00
Matthew Williams
a947baa87c Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb
am: be136b7a3e

* commit 'be136b7a3e3f117dea283d194d1e6979fb47662b':
  Redact Account info from getCurrentSyncs
2016-01-20 11:46:39 +00:00
Matthew Williams
0e7cd0a9fb Redact Account info from getCurrentSyncs am: f39549e389
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
  Redact Account info from getCurrentSyncs
2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257 Redact Account info from getCurrentSyncs
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
  Redact Account info from getCurrentSyncs
2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389 Redact Account info from getCurrentSyncs
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698)
2016-01-20 00:02:58 +00:00
Matthew Williams
af5c9f809c Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74
am: c455148edc

* commit 'c455148edce05b4862df8853a78276fb5f28151a':
  Sync extras bundle comparison can throw NPE
2015-11-13 02:09:35 +00:00
Matthew Williams
c455148edc Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f
am: 6d13650c74

* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
  Sync extras bundle comparison can throw NPE
2015-11-13 02:03:01 +00:00
Matthew Williams
a0d20db02f Sync extras bundle comparison can throw NPE am: c0f39c1ece
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE
2015-11-13 01:50:11 +00:00
Shreyas Basarge
cc7c1d3812 Sync extras bundle comparison can throw NPE am: 2f137b7705
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE
2015-11-13 01:50:02 +00:00
Shreyas Basarge
294611faa8 Sync extras bundle comparison can throw NPE
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE
2015-11-13 01:41:59 +00:00
Matthew Williams
34b700a7c2 Sync extras bundle comparison can throw NPE
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE
2015-11-13 01:41:59 +00:00
Shreyas Basarge
2f137b7705 Sync extras bundle comparison can throw NPE
Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
2015-11-12 15:32:44 +00:00
Matthew Williams
c0f39c1ece Sync extras bundle comparison can throw NPE
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033)
2015-11-11 14:34:04 +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
1af7a83939 Fixed key comparison in equals method
Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d
2015-08-20 10:24:14 -07:00
Dianne Hackborn
ae49872100 Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
...from Camera360 to Hangouts }

In the short URI toString, include a small summary of the ClipData (instead
of just saying it has a clip data).  This makes it a lot easier to understand
what is happening when you look at the log of activity starts.

Also separate out the activity manager dump of URI permission grants from
its dump of providers, so it is easy to just look at that state.

Change-Id: I68093d9f279944e1aa9a29347075f237f4f55ed3
2015-08-14 14:08:43 -07:00
Christopher Tate
56f0ff3c48 Make "Ask every time" actually work that way
..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
2015-08-13 18:56:05 -07:00
Svet Ganov
3e0be7440b Do not show removed permissions in the UI - framework
bug:23043018

Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5
2015-08-07 23:06:04 -07:00
Filip Gruszczynski
52d3312abe Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 2015-08-04 23:02:19 +00:00
Filip Gruszczynski
a01f48681c Make ResourceKey always use non-null configuration override.
We don't differentiate between null conifguration and
Configuration.EMPTY, but if ResourceKey uses both, it will produce
different hashes and won't be equal. This CL makes ResourceKey always
hold a non null reference to the Configuration object.

We started delivering the configuration overrides in
Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0, which changed behavior from
using always null, to using both null and Conifguration.EMPTY for empty
confgiuration. Now we will switch to using only one value, which is
Configuration.EMPTY.

Bug: 22620824
Change-Id: I090fd90ac21a6b3ebc7f2974a91dd7c861af10d7
2015-08-04 15:26:14 -07:00
Matthew Williams
665d0140ef Remove spurious syncmanager wake-ups
BUG: 22287469
1) Fix SyncManager waking up every 2 hrs if there is nothing
to do.
2) Fix sync wake-up alarm not being properly updated if the new
alarm was in the future.
2a) Due to staus bar sync signal that were removed post-K
one of the wake-ups was for 30s in the future, removed this
@hide intent completely.
3) The SyncManager will still set a timeout alarm for 5mins after
the start of a sync. Leaving this in as to post to a handler is
less expensive but more complex, and the alarm update is
correctly working now.

Change-Id: If51c9dd68391ccaeb480a17eb5a1364c4afe4c2a
2015-08-03 18:15:12 -07:00
Dianne Hackborn
28ec27cbfa Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
Slice 'em up!

Change-Id: Ibba3af7ec5b7f92e6d5e55a57aa838a7f7f936e1
2015-08-03 15:28:28 -07:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Svetoslav Ganov
9352af2a9e Merge "Remove dependencies on the package installer's package name" into mnc-dev 2015-07-29 17:54:23 +00:00
Sailesh Nepal
6b96de8dae Merge "Default permissions for sim call manager" into mnc-dev 2015-07-29 17:39:37 +00:00
Dianne Hackborn
eda1cc50ce Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 2015-07-29 17:05:58 +00:00
Svet Ganov
f1b7f20bb8 Remove dependencies on the package installer's package name
bug:22700053

Change-Id: I8540eb8577fbec84e1a67e31e1c31ba654c828a4
2015-07-29 08:33:46 -07:00
Sailesh Nepal
cf85562bc9 Default permissions for sim call manager
This CL adds the following permissions by default to the
SIM call manager:
 - microphone
 - phone

BUG: 22790160
Change-Id: Icaf1db6c6943b3ddbd16a946a81d1bfb734d761f
2015-07-28 22:16:25 -07:00
Dianne Hackborn
86cbc2bf30 Work on issue #22765972: Binder transactions running out of address...
...space causing package manager to fail

Lower the maximum IPC size we use in various places, to keep it
under the threshold of becoming dangerous.  Now everything tries
to keep not much more than 64k.

Change-Id: I814013097966a7843179e5d581bfdb254c5ae318
2015-07-28 18:13:21 -07:00
Dianne Hackborn
9dc6c61a80 Fix issue #22802782: APR: NPE in package manager with bad intent data
If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.

Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
2015-07-28 17:30:59 -07:00
Jeff Sharkey
0e621c3921 Also check app-ops on path-permissions.
Any place that we check permissions we also need to check any
app-ops associated with those permissions.  In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.

Bug: 22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
2015-07-24 15:16:11 -07:00
Jim Miller
abd35bfc81 Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev 2015-07-24 02:41:00 +00:00