Commit Graph

21193 Commits

Author SHA1 Message Date
Jeff Sharkey
d2b64d7018 Add ContentProvider.clearCallingIdentity().
ContentProvider has a getCallingPackage() method, which verifies
the remote package name against the current Binder identity.  When a
provider wants to clear that IPC identity, they need to clear both
the Binder state and the ContentProvider.getCallingPackage() state
together, so add methods to facilitate that.

Also fix subtle bug so we don't try translating relative paths.

Bug: 117627072
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: Ifa3e1f745334abf625fdcc314b308a047c49ce73
2018-10-20 15:14:22 -06:00
Brad Ebinger
1f69fd6899 Merge "Expose the empty MmTelCapabilities constructor" am: 7fff7e5eff am: 4e63b90a3b
am: 6984c36cc0

Change-Id: I4fbda78af72724c96ba8d4ec8dfe104f085d5d79
2018-10-19 14:16:22 -07:00
Brad Ebinger
6984c36cc0 Merge "Expose the empty MmTelCapabilities constructor" am: 7fff7e5eff
am: 4e63b90a3b

Change-Id: Iad80098eda2635ea490929e3bab84e7575b08c59
2018-10-19 13:54:58 -07:00
Haoyu Zhang
0a04650e51 Merge "Add textLocale attributes to TextView and TextAppearanceSpan" 2018-10-19 20:30:02 +00:00
chen xu
7f3258ac83 Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED" am: 2c10a29eaa
am: fd6cccc775

Change-Id: I45f482ad6b57cc3ff7c5f125f5f98f748f54063c
2018-10-19 13:26:32 -07:00
Brad Ebinger
7fff7e5eff Merge "Expose the empty MmTelCapabilities constructor" 2018-10-19 20:20:14 +00:00
Chen Xu
39f0965925 Merge "new SystemAPI for setCarrierDataEnabled" am: 7dd38c2115
am: 6ec00c2584

Change-Id: I83fa3369a48b9cc6bfe962f2ae101f06709793ae
2018-10-19 13:16:05 -07:00
Treehugger Robot
2c10a29eaa Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED" 2018-10-19 19:19:26 +00:00
Chen Xu
3e2deae2fd Merge "expose some Telephony.Carriers cols system APIs" am: f2e0f57976 am: bb0689b6d5
am: 76819cc048

Change-Id: Ie98dd2591f8f83d00751a6e78af54c06b75314d7
2018-10-19 11:55:25 -07:00
Chen Xu
7dd38c2115 Merge "new SystemAPI for setCarrierDataEnabled" 2018-10-19 18:47:27 +00:00
Chen Xu
76819cc048 Merge "expose some Telephony.Carriers cols system APIs" am: f2e0f57976
am: bb0689b6d5

Change-Id: I39fa9903ca0b3709fe420f80cfa0a3ae32a28537
2018-10-19 11:29:43 -07:00
chen xu
b591f9d2dd correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED
keep the value same as master

Bug: 117930373
Test: telephony unit test
Change-Id: I0bad21eeed2b4667fbb781253828b99332103b31
Merged-in: Id170063bfdb1e3325f67e8680231ab4deda7d65d
2018-10-19 18:18:39 +00:00
Chen Xu
f2e0f57976 Merge "expose some Telephony.Carriers cols system APIs" 2018-10-19 17:56:14 +00:00
taiki tsutsumi
7bb40b5909 Add CarrierConfig to hide "Network default" option in Caller ID setting
am: 187c9943ff

Change-Id: I46132178c349ad5b914fd498f6985ef7988b9060
2018-10-19 10:51:09 -07:00
Chen Xu
46d75f94cc Merge "new SystemAPI for setCarrierDataEnabled" 2018-10-19 17:11:25 +00:00
Junyu Lai
555917c3b0 Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab am: 745952eac8
am: 70626e3b94

Change-Id: I2bec503c5ffac156b679a48c09591458ab716789
2018-10-19 09:47:40 -07:00
Youming Ye
c4b647458c Merge changes from topic "cherrypick"
* changes:
  Add CarrierConfig to hide "Network default" option in Caller ID setting
  add four new carrier configs for supplementary service precautions.
2018-10-19 16:33:22 +00:00
Junyu Lai
70626e3b94 Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab
am: 745952eac8

Change-Id: I24b45f860992626968a6adfb0ff6b6389c85cf45
2018-10-19 09:26:39 -07:00
Jeff Sharkey
047edaeaa3 Merge changes I86f597f1,I5c9c09dd
* changes:
  MediaStore deprecations for Q.
  Convenience method for obtaining thumbnails.
2018-10-19 15:21:54 +00:00
Junyu Lai
f709e754ab Merge "Add new callback to inform blocking of network on specific uid." 2018-10-19 15:20:48 +00:00
Abodunrinwa Toki
e428c32653 Merge "Introduce TextClassifier.detectLanguage() API." 2018-10-19 14:27:26 +00:00
sqian
9545440334 Merge "Fix current.txt" am: 2810d0ae3e
am: 26c2c5e50d

Change-Id: I9717d3c4d084498a1b1b23aa0639bc28721ccda1
2018-10-19 00:00:26 -07:00
Seigo Nonaka
2683a99d42 Merge "Change add{StyleRun, ReplacementRun} to append{StyleRun, ReplacementRun}" 2018-10-19 05:22:22 +00:00
taiki tsutsumi
187c9943ff Add CarrierConfig to hide "Network default" option in Caller ID setting
Add a key to hide "Network default". When value is false,
"Network default" shouldn't be displayed for options in Caller ID
setting.

Test: manual - check options in Caller ID setting
Bug: 111809829
Change-Id: Id07ab2d2281a1ebb07d631045ada705cda53daf2
Merged-In: I5fbe9734dbb092b25fd145344c7559d2dee79df2
2018-10-19 01:12:39 +00:00
Courtney Goeltzenleuchter
42bce33475 Merge "Update to EGL 1.5" 2018-10-18 23:33:45 +00:00
Brad Ebinger
dfe87a6d16 Merge "Expose ImsExternalCallState constructor as @SystemApi" am: 4133a00a10 am: 8e5a756f9d
am: aa2e73d8a5

Change-Id: I12e15589ed079a100efd3a872eb60193951b4efa
2018-10-18 15:39:04 -07:00
Haoyu Zhang
1137512f7c Add textLocale attributes to TextView and TextAppearanceSpan
Bug: 112390716
Test: atest TextAppearanceSpanTest TextViewTest
Change-Id: I812f76cc3acec14b9839436cc7c5cc1ef827998e
2018-10-18 15:38:30 -07:00
chen xu
3d59fdb70d new SystemAPI for setCarrierDataEnabled
Bug: 116138716
Test: Telephony unit test
Change-Id: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
Merged-in: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
2018-10-18 15:32:48 -07:00
Brad Ebinger
aa2e73d8a5 Merge "Expose ImsExternalCallState constructor as @SystemApi" am: 4133a00a10
am: 8e5a756f9d

Change-Id: Icc899e3da0472a9409856e51d1bd8f02074431ad
2018-10-18 15:24:51 -07:00
Seigo Nonaka
7b86fe573c Change add{StyleRun, ReplacementRun} to append{StyleRun, ReplacementRun}
Giving any range to the Builder is too much freedum and hard to tell
errors. Changes to accept length instead of ranges. By this change, we
can prevent and tell errors about
- The gap in the text that no Paint is assigned.
- The given range is overlapped.
- The given range exceeds the text length.

Bug: 112327179
Test: TreeHugger

Change-Id: Iefc078b1f7be2d006a65b46e0b4ea1018ecb29e7
2018-10-18 14:58:18 -07:00
Shuo Qian
fc6a54b841 Merge "Fix current.txt error" 2018-10-18 21:45:06 +00:00
chen xu
5704e23d97 new SystemAPI for setCarrierDataEnabled
Bug: 116138716
Test: Telephony unit test
Change-Id: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
2018-10-18 21:41:42 +00:00
Jeff Sharkey
5282796ac3 MediaStore deprecations for Q.
Mark "_data" columns as explicitly deprecated, since they'll only
work for pre-Q apps.

Bug: 111268862
Test: manual
Change-Id: I86f597f1245cc255f6ee114957829763b1a76e4c
2018-10-18 14:56:28 -06:00
Jeff Sharkey
4e5efa3186 Convenience method for obtaining thumbnails.
Obtaining a thumbnail for a Uri requires opening it with the slightly
obscure openTypedAssetFileDescriptor(), passing in "image/*" with the
right Bundle of EXTRA_SIZE to hint the target area on screen, and
defensively scaling any returned results.

This is pretty tedious to get right, so offer a convenience method
that does all this for the developer.  Internally uses ImageDecoder
to follow best-practices, and replaces older getDocumentThumbnail()
implementation by delegating to this one.

A future CL will teach ImageDecoder about how to read any embedded
EXIF thumbnails, including any required rotation.

Bug: 111268862
Test: atest FrameworksCoreTests:android.content.ContentResolverTest
Change-Id: I5c9c09ddf9b480f3b5c6ade0a078cccb68de2f2b
2018-10-18 14:32:51 -06:00
TreeHugger Robot
dc315fd243 Merge "WebView: add new integer for billing threats" 2018-10-18 19:50:08 +00:00
Brad Ebinger
4db427a5a8 Expose the empty MmTelCapabilities constructor
1) Allow for empty MmTelFeature.MmTelCapabilities to be
accessible via @SystemApi.
2) Add correct @nonnull/@nullable annotations as per API
review.

Bug: 117555643
Bug: 116117215
Test: Manual
Change-Id: Id445e4702f44528b4b1ab59129cf35803ae70053
2018-10-18 12:29:58 -07:00
sqian
c62bb2d69c Fix current.txt
Bug: 113072551
Test: compile
Change-Id: I3e9d5ec0460eae13da88671e1e7cb873638352ee
Merged-In: I00720bc3f947adf3c1072c75a040e85333d317f5
2018-10-18 19:00:36 +00:00
sqian
b687978e15 Fix current.txt error
Bug: 113072551
Test: compile
Change-Id: I00720bc3f947adf3c1072c75a040e85333d317f5
2018-10-18 11:49:09 -07:00
Shuo Qian
12a2b2ec6d Merge "Compare Emergency number display priority" am: a9d551ca7b am: 1f36225eaf
am: 8b1a350056

Change-Id: I3b84be0f8beba2d9108eeb4d43f4c633b837e368
2018-10-18 09:55:24 -07:00
Brad Ebinger
4133a00a10 Merge "Expose ImsExternalCallState constructor as @SystemApi" 2018-10-18 16:54:38 +00:00
Shuo Qian
8b1a350056 Merge "Compare Emergency number display priority" am: a9d551ca7b
am: 1f36225eaf

Change-Id: Ie177f4fda621f5415f236bae305731ebcf7c34fe
2018-10-18 08:39:48 -07:00
Jack Yu
e4eab61e1a Merge "Supported v1.3 data profile" am: 1e4f6fbe23 am: 405ea01c54
am: 7413496e2c

Change-Id: Ibc6299f8b5a03e2f7228f462486342fed00ed67c
2018-10-18 08:33:01 -07:00
Jack Yu
7413496e2c Merge "Supported v1.3 data profile" am: 1e4f6fbe23
am: 405ea01c54

Change-Id: Ia6737beb1fda5a01159a9ed52e5e26976744b9ab
2018-10-18 07:52:24 -07:00
Roland Levillain
9426e28727 resolve merge conflicts of acbcff9e7d to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 117349311
Change-Id: I1d07e5d6e749bd96cf322dd77422d6401233f081
2018-10-18 14:18:17 +01:00
Nate Fischer
f9a235316c WebView: add new integer for billing threats
No change to logic, this adds a new integer constant for Safe Browsing
billing threats.

This also adds ending periods in the docs for existing threat types.

Bug: 117470538
Test: N/A
Change-Id: I5368601efc7d587af1f530b7bf2825f277424082
2018-10-17 20:30:54 -07:00
Abodunrinwa Toki
7cefd4f20c Introduce TextClassifier.detectLanguage() API.
Implementation will follow in TextClassifierImpl (for AOSP)
and SystemTextClassifier (for OEM version).

Bug: 116020587
Test: atest android.view.textclassifier.TextLanguageTest
Change-Id: Iaf7e8df2a14fe22335805bee41f138468430aea6
2018-10-18 03:04:28 +01:00
Chen Xu
535b74527d Merge "Revert "Revert "refactor radioPowerstate""" 2018-10-17 22:45:38 +00:00
Chen Xu
7395c630b0 Revert "Revert "refactor radioPowerstate""
This reverts commit 05188f3555.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id170063bfdb1e3325f67e8680231ab4deda7d65d

Bug: 117349311
2018-10-17 22:45:21 +00:00
Shuo Qian
a9d551ca7b Merge "Compare Emergency number display priority" 2018-10-17 22:12:02 +00:00
chen xu
851004813a expose some Telephony.Carriers cols system APIs
Bug: 117473154
Test: Telephony unit test

Change-Id: I8e6b873842f42b8cb3244a14b6e6c5d9c1ae5318
2018-10-17 13:30:57 -07:00