git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

WyattRiley [Thu, 28 Feb 2019 19:43:12 +0000 (11:43 -0800)]

DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot

Safe order of pointer setting and background thread start
Verifying mCallEndElapsedRealtimeMillis is not the initial value

Bug: 112159033
Bug: 115361555
Bug: 125124724
Test: Verified not-after-boot with test code b/115361555#comment14
Test: Reproed NPE with test thread sleep and verify fix
Change-Id: Icd2ea91d71da71c8fda109ceb70514733d35060b

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 28 Jun 2017 01:49:07 +0000 (02:49 +0100)]

DO NOT MERGE No smart text assist for unprovisioned device.

Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit FrameworksCoreTests:android.widget.TextViewActivityMoutseTest
Bug: 120866126
Bug: 62745625
Merged-In: I360250a5c2a92d09c8d8f559b51c74f490f70c2c
Change-Id: I360250a5c2a92d09c8d8f559b51c74f490f70c2c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 17:55:03 +0000 (17:55 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c

Change-Id: I4fa4b56b1472ed6c25bc431ef9ce8060cb04a1f1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:53 +0000 (17:54 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147

Change-Id: I2a8463e8e885a81229b28e7e99e7432a08a04c93

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:43 +0000 (17:54 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522

Change-Id: I9e0504f59437cc8fd72e96630a6fb753a4cbb423

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:29 +0000 (17:54 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba

Change-Id: I51fbf27831b8b981a7b1a6e2af9cf46d8e544c12

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:16 +0000 (17:54 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8

Change-Id: I8da1dd728ff244a1363d9274aa3f41d1c6081ee8

commit | commitdiff | tree

Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]

Select only preinstalled Spell Checker Services

When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.

Fixes: 64764051
Bug: 118694079
Test: Manually as follows:
1. Open 'packages/inputmethods/LatinIME/java/AndroidManifest.xml'
     and remove 'AndroidSpellCheckerService'
2. lunch aosp_buillhead-userdebug && make -j
3. Flash the image
4. adb shell dumpsys textservices
    -> no spell checker is recognized
5. adb shell settings get secure selected_spell_checker
    -> null
6. tapas SampleSpellCheckerService
7. make -j
8. adb install -r $OUT/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
9. adb shell dumpsys textservices
    -> SampleSpellCheckerService is recognized
10. adb shell settings get secure selected_spell_checker
    -> null

Change-Id: I16f12293d15258c9148677c7ee09fe6dcf81e81d
Merged-In: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:52 +0000 (00:44 +0000)]

[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba

Change-Id: I9b15a7332565cc39eee4abb9faccb2d148281bf0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:47 +0000 (00:44 +0000)]

[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e

Change-Id: Ib4cbddb955c57d2d59fb3b7fe656e21bc56266aa

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:41 +0000 (00:44 +0000)]

[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7

Change-Id: I019b36991306a8f7887b7a0b8233b2c9f1c9ed32

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:36 +0000 (00:44 +0000)]

[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10

Change-Id: Idfe048ca52ab0eb317e9313f56b884d264c14fd5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:29 +0000 (00:44 +0000)]

[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1

Change-Id: I11efc66592aada0a9b54299b6d782e92e247f811

commit | commitdiff | tree

Bryan Ferris [Wed, 9 Jan 2019 23:22:20 +0000 (15:22 -0800)]

Revert "Select only preinstalled Spell Checker Services"

This reverts commit fa265ed97026e3b8675a2ccbf4035cad6dc1523f.

Reason for revert: The backport for b/118694079 was applied improperly.

The fix involved filtering the class members list of spell checkers into a new list before searching it. The backport filtered the list but failed to update references to the class member into references to the local variable, creating no change in observable behavior. A new version of this commit will be simultaneously uploaded, which both fixes the bad behavior and allows us to have exactly 1 CL per branch that fixes the issue.

Bug: 118694079

Change-Id: Ic38a2ca2ddede7f0929779b0f2292b7823c11e87
Merged-In: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9

commit | commitdiff | tree

TreeHugger Robot [Tue, 8 Jan 2019 11:55:30 +0000 (11:55 +0000)]

Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557 am: b2b98a008b skipped: 3823545fee
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557 am: b2b98a008b
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676
  [automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306
  RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.

commit | commitdiff | tree

Tony Mak [Thu, 29 Nov 2018 17:37:42 +0000 (17:37 +0000)]

RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.

Also don't show smart actions for selections in text with unsupported
characters.

Bug: 116321860
Test: runtest -x cts/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
Change-Id: Ib2ee544b5783234fba8ee2f93adf0b36b039520f
Merged-In: Ib2ee544b5783234fba8ee2f93adf0b36b039520f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Jan 2019 14:08:07 +0000 (14:08 +0000)]

[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557 am: b2b98a008b skipped: 3823545fee

Change-Id: I3c673c0d4337914308f5cdd1081e564f96cc3383

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:59 +0000 (14:07 +0000)]

[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557 am: b2b98a008b

Change-Id: I29c3f97af12987c8a1dd8a69529641d32d2dd172

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:52 +0000 (14:07 +0000)]

[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676 am: efb165f557

Change-Id: Ibc588da08fbb6069989c7c97110e4cecea0b0ce5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:43 +0000 (14:07 +0000)]

[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306 am: 363e47e676

Change-Id: I828e0c99ab41935d20033c970b5131f2fcbf9085

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:33 +0000 (14:07 +0000)]

[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: 73f398d306

Change-Id: I423ddd8df74bee8dbf7cd96009bbdffebf81b93a

commit | commitdiff | tree

Tony Mak [Thu, 29 Nov 2018 17:37:42 +0000 (17:37 +0000)]

RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.

Also don't show smart actions for selections in text with unsupported
characters.

Bug: 116321860
Test: runtest -x cts/tests/tests/text/src/android/text/util/cts/LinkifyTest.java

Change-Id: Id271cab8aef6b9b13ef17f1a8654c7616f75cf13

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 21 Dec 2018 16:50:53 +0000 (16:50 +0000)]

[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664 am: 17232346f0 skipped: 46f972fea5

Change-Id: I93997d7383990bd70492944411196c8fbb6b319e

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)]

[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664 am: 17232346f0

Change-Id: I896fbc8000b44041f54f7e314eb1b970c4644389

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 21 Dec 2018 16:49:03 +0000 (16:49 +0000)]

[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664

Change-Id: Ifd8d821683c3c61e2a0e10ac4ce0c24e74e06282

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 21 Dec 2018 16:48:57 +0000 (16:48 +0000)]

[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0

Change-Id: I2bb3f878634f4ab80f400fccbd4d1fe6610e5a82

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 21 Dec 2018 16:48:50 +0000 (16:48 +0000)]

[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b

Change-Id: I944dc076c63ba9fd5101bc0366a342e057a13d47

commit | commitdiff | tree

WyattRiley [Thu, 6 Dec 2018 19:43:58 +0000 (11:43 -0800)]

Adding SUPL NI Emergency Extension Time

Configurable by carrier config.xml resource

Bug: 118839234
Bug: 115361555
Bug: 112159033
Test: On device, see b/115361555#comment14
Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Merged-In: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61

commit | commitdiff | tree

WyattRiley [Thu, 6 Dec 2018 19:43:58 +0000 (11:43 -0800)]

Adding SUPL NI Emergency Extension Time

Configurable by carrier config.xml resource

Bug: 118839234
Bug: 115361555
Bug: 112159033
Test: On device, see b/115361555#comment14
Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Merged-In: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61

commit | commitdiff | tree

Jakub Pawlowski [Thu, 29 Nov 2018 17:54:21 +0000 (18:54 +0100)]

Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings

Bug: 119819889
Test: compilation
Change-Id: If51d0e2af74d99758f79a603d40cc2f5c84e4dde
Merged-In: If51d0e2af74d99758f79a603d40cc2f5c84e4dde

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Nov 2018 22:49:58 +0000 (22:49 +0000)]

Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:40 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa

Change-Id: I63d8639a52f0be081b397e1bb7813d1e7e4b8aa4

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:32 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad

Change-Id: Iece38d8723b40e22f86f4aa599d42dbf9a2fcbab

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:25 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f

Change-Id: If661d9f3206b0e9da2a98ffb14b0ff38154cd757

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:20 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63

Change-Id: I9541ff6206955ed3479d5b4aa6c78f23304d3165

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:12 +0000 (20:07 +0000)]

[automerger] Select only preinstalled Spell Checker Services am: fa265ed970

Change-Id: I6a0825a14c8b0f38415cccacc315ba84eb88f5b9

commit | commitdiff | tree

Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]

Select only preinstalled Spell Checker Services

When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.

Fixes: 64764051
Bug: 118694079
Test: Manually as follows:
0. Make sure AOSP keyboard is pre-installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0  -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
    -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb reboot
8. adb shell settings get --user 0 secure selected_spell_checker
    -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793
  [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]

Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]

Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]

Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]

Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
  [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]

Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]

Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
  [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]

Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]

Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
  [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]

Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]

Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f
  [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]

Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:15 +0000 (19:47 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f

Change-Id: I63583ee2589e27644de2fe138fde88d1efd7c4f6

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:09 +0000 (19:47 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed

Change-Id: I58f6aae098f5dcb6c8ecfcaef6427f5276d36324

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 19:46:51 +0000 (11:46 -0800)]

Import translations. DO NOT MERGE

Change-Id: I9be4c84c6a0abd2cecfc8ac49b1d9b8a8fe38079
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:53 +0000 (19:40 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903

Change-Id: I80379f2416b5f60734fce3db6b8d74ceca628331

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:44 +0000 (19:40 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2

Change-Id: I17330d6b3d4cf62d89a3413605ceae1b701bb858

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 19:40:18 +0000 (11:40 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ib25ad353f0684aebfd2817cabd5abea5a63d970f
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:19 +0000 (18:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4

Change-Id: I2bb4251fa00c257d00e4cefa4ddca89fc24ad7f3

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:11 +0000 (18:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9

Change-Id: Id0e2056ac5c7ef52d8d2f844bb3ff5c660e27959

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 18:49:42 +0000 (10:49 -0800)]

Import translations. DO NOT MERGE

Change-Id: I80ba9acb8d4bcf859fbef444b4553b720b67b347
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:43:44 +0000 (18:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0

Change-Id: I71ed720b5ec39dc9be62aa13d71f5d06f3bec0e3

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:43:37 +0000 (18:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57

Change-Id: I997246032f47b236724ae93f3fe4e0ba34053d66

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 18:43:10 +0000 (10:43 -0800)]

Import translations. DO NOT MERGE

Change-Id: Icda106c2509ee7cfe135a526ddc6b1da312e0d00
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:31:16 +0000 (18:31 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a

Change-Id: I717bb8adc24725ee2c219bb322520ec4d6ff3256

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:31:06 +0000 (18:31 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30

Change-Id: I098638c4895f56981058a6d7e3cd08dd47d6c3d6

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 18:30:20 +0000 (10:30 -0800)]

Import translations. DO NOT MERGE

Change-Id: I7f4eca632304e01212332a24545020f6641d8bd3
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:01:54 +0000 (18:01 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793

Change-Id: I596b914378d3cf86fb5d93c515c5ff47176d636f

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 18:01:47 +0000 (18:01 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b

Change-Id: Ie294af994de6deefe985c3af3695a2ed7097928e

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 18:01:28 +0000 (10:01 -0800)]

Import translations. DO NOT MERGE

Change-Id: Id581072702a6cd8312047105027fe82db61d1053
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 17:38:36 +0000 (17:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807

Change-Id: Ib778cb2efec1d341648d54bd38a0c215bb7fbc18

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 17:38:30 +0000 (17:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7

Change-Id: I7f4920d65b03f1bc7e4b398e9391560cc36a4d1a

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 17:38:06 +0000 (09:38 -0800)]

Import translations. DO NOT MERGE

Change-Id: I39c59a482736fd930abc77d8c3f0d26541ac7fe9
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 17:31:53 +0000 (17:31 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343

Change-Id: If19056c1c2ed311693bd74ee5514fa789f5a1faa

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Nov 2018 17:31:43 +0000 (17:31 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69

Change-Id: Ied955d35cf088b5e432ff984d948d4ccf075562c

commit | commitdiff | tree

Bill Yi [Sat, 10 Nov 2018 17:31:11 +0000 (09:31 -0800)]

Import translations. DO NOT MERGE

Change-Id: I2d1faf1497f7bccdebee6ae93a8a3f56c01ca042
Auto-generated-cl: translation import

commit | commitdiff | tree

Varun Shah [Sat, 27 Oct 2018 00:03:23 +0000 (17:03 -0700)]

RESTRICT AUTOMERGE: Added an app id security check in isAppForeground.

ActivityManagerService#isAppForeground now checks if the caller has the
permission to view if an app is in the foreground.

Bug: 115384617
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.ActivityManagerTest#testIsAppInForegroundNormal
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.ActivityManagerTest#testIsAppInForegroundMalicious
Change-Id: I9602c89b2d40036e525c38960a08326dc74c6682

commit | commitdiff | tree

Steve Elliott [Tue, 25 Sep 2018 15:23:38 +0000 (15:23 +0000)]

DO NOT MERGE: Add configurable default setting for assistant componentname

By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.

Test: manual
Bug: 111603898
Change-Id: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48

commit | commitdiff | tree

Jeff Sharkey [Fri, 12 Oct 2018 04:31:20 +0000 (04:31 +0000)]

Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 24 Sep 2018 19:23:57 +0000 (13:23 -0600)]

RESTRICT AUTOMERGE: Recover shady content:// paths.

The path-permission element offers prefix or regex style matching of
paths, but most providers internally use UriMatcher to decide what
to do with an incoming Uri.

This causes trouble because UriMatcher uses Uri.getPathSegments(),
which quietly ignores "empty" paths.  Consider this example:

    <path-permission android:pathPrefix="/private" ... />

    uriMatcher.addURI("com.example", "/private", CODE_PRIVATE);

    content://com.example//private

The Uri above will pass the security check, since it's not
technically a prefix match.  But the UriMatcher will then match it
as CODE_PRIVATE, since it ignores the "//" zero-length path.

Since we can't safely change the behavior of either path-permission
or UriMatcher, we're left with recovering these shady paths by
trimming away zero-length paths.

Bug: 112555574
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests
Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:44 +0000 (00:19 +0000)]

[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac

Change-Id: I72c58f65bd2709e23d7631d2e0acc06b40a917f9

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:37 +0000 (00:19 +0000)]

[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665

Change-Id: I0cd990dcdfb899fa419cf1b28934d4118c225937

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:27 +0000 (00:19 +0000)]

[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac

Change-Id: Id59316f6628fcabc71962bd9ca8ab15cbbfb8b6d

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:19 +0000 (00:19 +0000)]

[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c

Change-Id: I5f8b88ca54c22bb978fc6c468259fec9e0e9898a

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:12 +0000 (00:19 +0000)]

[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd

Change-Id: I80ac911a166e12eedf77518436808d4f3ede872c

commit | commitdiff | tree

Jeff Sharkey [Mon, 24 Sep 2018 19:23:57 +0000 (13:23 -0600)]

RESTRICT AUTOMERGE: Recover shady content:// paths.

The path-permission element offers prefix or regex style matching of
paths, but most providers internally use UriMatcher to decide what
to do with an incoming Uri.

This causes trouble because UriMatcher uses Uri.getPathSegments(),
which quietly ignores "empty" paths.  Consider this example:

    <path-permission android:pathPrefix="/private" ... />

    uriMatcher.addURI("com.example", "/private", CODE_PRIVATE);

    content://com.example//private

The Uri above will pass the security check, since it's not
technically a prefix match.  But the UriMatcher will then match it
as CODE_PRIVATE, since it ignores the "//" zero-length path.

Since we can't safely change the behavior of either path-permission
or UriMatcher, we're left with recovering these shady paths by
trimming away zero-length paths.

Bug: 112555574
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests
Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a

commit | commitdiff | tree

Wayne Lin [Mon, 1 Oct 2018 05:45:25 +0000 (05:45 +0000)]

Merge "[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:44:56 +0000 (05:44 +0000)]

Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:44:56 +0000 (05:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:44:56 +0000 (05:44 +0000)]

Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:43:47 +0000 (05:43 +0000)]

Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:43:47 +0000 (05:43 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:43:47 +0000 (05:43 +0000)]

Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:42:36 +0000 (05:42 +0000)]

Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905
Import translations. DO NOT MERGE

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.