Commit Graph

415556 Commits

Author SHA1 Message Date
Philip P. Moltmann
dc65aa3fce Refactor updatePermissions path
- Give the methods more descriptive names
- Reduce the number of paramters
- Add comments

No functional change

Test: Built
      atest --test-mapping frameworks/base/services/core/java/com/android/server/pm/permission:presubmit
Change-Id: I2fdf5bf7a0223604512307f26ad4881fde913873
2019-04-15 14:57:34 -07:00
Android Build Merger (Role)
d89ba63927 Merge "Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev am: acf6698f0c am: 71829af911" 2019-04-15 16:31:10 +00:00
Kevin Rocard
5345a3aec4 Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev am: acf6698f0c
am: 71829af911

Change-Id: I86a11415d0534d298d682c6453007bd12233fac7
2019-04-15 09:30:22 -07:00
Neil Fuller
21a7591c58 Merge "Switch to HexEncoding from ByteStringUtils" 2019-04-15 16:23:16 +00:00
Kevin Rocard
71829af911 Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev
am: acf6698f0c

Change-Id: Ie8c1fc0052382d77ec9f4c9727c73cddfc0c3e1f
2019-04-15 09:17:00 -07:00
TreeHugger Robot
acf6698f0c Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev 2019-04-15 15:44:32 +00:00
Yohei Yukawa
dcd5379d9b Fix '-u <user id>' handling in 'adb ime enable' and 'adb ime set' am: 3403f2d85e
am: e39528c4f7

Change-Id: I4c8678778cadc4fa26ea310a738f549435d4e48b
2019-04-15 08:43:14 -07:00
Yohei Yukawa
e39528c4f7 Fix '-u <user id>' handling in 'adb ime enable' and 'adb ime set'
am: 3403f2d85e

Change-Id: I78dda9e117a873bb2f02a6fad9fdf4ea4df6b546
2019-04-15 08:36:41 -07:00
Yohei Yukawa
3403f2d85e Fix '-u <user id>' handling in 'adb ime enable' and 'adb ime set'
This is a follow up CL to my previous CLs [1][2], which added
'-u <user id>' option to
   adb shell ime enable <ime id>
and
   adb shell ime set <ime id>
respectively.

Those CL had a bug that was introduced during the last round of the
code review when I was addressing a review comment.  As a result,
those two commands simply fail if '-u' or '--user' option is
specified.  With this CL, those we can finally start specifying the
user ID for those two commands.

This CL also fixes a bug that output for
  adb shell ime set -u all <ime id>
are not correctly formatted.

Note that this CL only fixes a bug in debug shell commands. There
should be no user-visible behavior change in end-user use cases.

 [1]: Ia0f873e4589a9fc3f549469e3d1d966640dc2df5
      e177170f64
 [2]: I397cf0fb418a395dcafc0ab0d8d4e553b0f2eaab
      099f80ce97

Bug: 120784635
Test: Manually tested as follows:
  1. Build aosp_blueline-userdebug and flash it
  2. make -j SoftKeyboard
  3. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  4. adb shell pm create-user test
  5. adb shell am switch-user 10
  6. adb shell ime disable -u 0 com.example.android.softkeyboard/.SoftKeyboard
     -> Input method com.example.android.softkeyboard/.SoftKeyboard: now disabled for user #0
  7. adb shell ime enable -u 0 com.example.android.softkeyboard/.SoftKeyboard
     -> Input method com.example.android.softkeyboard/.SoftKeyboard: now enabled for user #0
  8. adb shell ime set -u 0 com.example.android.softkeyboard/.SoftKeyboard
     -> Input method com.example.android.softkeyboard/.SoftKeyboard selected for user #0
Test: Manually tested as follows.
  1. Build aosp_blueline-userdebug and flash it
  2. adb shell pm create-user test
  3. adb shell pm create-user restricted_test
  4. adb root
  5. adb shell pm set-user-restriction --user 11 no_debugging_features 1
  6. adb shell am switch-user 10
  7. adb shell am switch-user 11
  8. adb shell am switch-user 0
  9. adb shell ime set -u all com.android.inputmethod.latin/.LatinIME
     -> Input method com.android.inputmethod.latin/.LatinIME selected for user #0
        Input method com.android.inputmethod.latin/.LatinIME selected for user #10
        User #11 is restricted with DISALLOW_DEBUGGING_FEATURES.
 10. adb shell ime disable -u all com.android.inputmethod.latin/.LatinIME
     -> Input method com.android.inputmethod.latin/.LatinIME: now disabled for user #0
        Input method com.android.inputmethod.latin/.LatinIME: now disabled for user #10
        User #11 is restricted with DISALLOW_DEBUGGING_FEATURES.
Change-Id: I4e396519400c0ccd17322fe085b45456621714e7
2019-04-15 08:16:58 -07:00
Evan Laird
69c9cc798b [automerger skipped] Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev am: eb24d06f8d
am: 25299db420 -s ours
am skip reason: subject contains skip directive

Change-Id: Id53c95b26415f03232a42fad4e7b641f144ed4ef
2019-04-15 08:16:26 -07:00
Evan Laird
25299db420 Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev
am: eb24d06f8d

Change-Id: I619e34943d8b669ca8ddfa8337f695919b52a13d
2019-04-15 08:04:47 -07:00
Patrick Baumann
44e41b3959 Merge "Don't hold mPackages when clearing package state" into qt-dev am: e299aa4ea4
am: 1342c26cb4

Change-Id: I6e10807c07016cb16d15ab51ff0c673c1cf7978a
2019-04-15 07:40:26 -07:00
TreeHugger Robot
eb24d06f8d Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev 2019-04-15 14:36:46 +00:00
Evan Laird
3a0c58ae57 DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView
We still need to save a layer for the BlendMode.CLEAR paint to do the
right thing. But with this we can save just the layer needed to draw the
battery instead of the whole battery meter view.

Test: visual
Bug: 130536257
Change-Id: I9d5844440250ccd9174e6c001e051c9adf62a2d0
(cherry picked from commit b4c703b8e3)
2019-04-15 14:36:37 +00:00
Patrick Baumann
1342c26cb4 Merge "Don't hold mPackages when clearing package state" into qt-dev
am: e299aa4ea4

Change-Id: I9c9f087fafbc977c2dc5950dd567ffd107b3bc45
2019-04-15 07:32:28 -07:00
TreeHugger Robot
e299aa4ea4 Merge "Don't hold mPackages when clearing package state" into qt-dev 2019-04-15 14:15:53 +00:00
lumark
eba5ecaf04 Merge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev am: 49c98a7b63
am: 7576e77850

Change-Id: Id2a282e4f501e48e75ef63e0e5583c8e97f73fde
2019-04-15 06:28:08 -07:00
Jorim Jaggi
c3e0f8239a Merge "Fix issue in attached layouting" into qt-dev am: 9aa2d740bd
am: c6cd7560c8

Change-Id: If8ac13cd8e3e7dc15000c6e7c49bab07dcd4f4bb
2019-04-15 06:20:49 -07:00
Mathew Inwood
67ca2223e3 Merge "Merge "Move some telephony methods to max-sdk-p list." am: 6c702ac545 am: 5633332ecc" into qt-dev-plus-aosp
am: 083cb78ca8

Change-Id: I22230ce76976d72518725af5a06ab1a99f7383c8
2019-04-15 06:09:50 -07:00
lumark
7576e77850 Merge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev
am: 49c98a7b63

Change-Id: I371879f38f457b50c86175eb46fd21859767401d
2019-04-15 06:00:11 -07:00
arangelov
4a4c30883d Merge "Add new metrics for ManagedProvisioning." into qt-dev am: 6243f0aa27
am: bea1848fb0

Change-Id: I394a3024b3ab530b74d759cfe2df3662f9f1b5e8
2019-04-15 05:54:35 -07:00
Jorim Jaggi
c6cd7560c8 Merge "Fix issue in attached layouting" into qt-dev
am: 9aa2d740bd

Change-Id: Idd371db0aae8c8be2388d82e4f8f9bcc0b7a4cf9
2019-04-15 05:54:31 -07:00
Android Build Merger (Role)
083cb78ca8 Merge "Merge "Move some telephony methods to max-sdk-p list." am: 6c702ac545 am: 5633332ecc" into qt-dev-plus-aosp 2019-04-15 12:45:40 +00:00
Riddle Hsu
98f5f624d9 Merge "Reduce transactions for acquiring and releasing provider" into qt-dev am: 59b8b82e74
am: e6cc6440ba

Change-Id: I95a709b3c32b05695ac7e68622cde1bc3c45a525
2019-04-15 05:45:31 -07:00
Mathew Inwood
9638fa1e3c Merge "Move some telephony methods to max-sdk-p list." am: 6c702ac545
am: 5633332ecc

Change-Id: Ie78e931cd6f39beccf8b2a710a43275ad2aae26d
2019-04-15 05:45:11 -07:00
arangelov
bea1848fb0 Merge "Add new metrics for ManagedProvisioning." into qt-dev
am: 6243f0aa27

Change-Id: Ib66979ebe21efcdf2fb2ff8be9578ea9dee0cdb9
2019-04-15 05:44:39 -07:00
TreeHugger Robot
49c98a7b63 Merge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev 2019-04-15 12:42:30 +00:00
Riddle Hsu
e6cc6440ba Merge "Reduce transactions for acquiring and releasing provider" into qt-dev
am: 59b8b82e74

Change-Id: I4368e7f955b47042d0ecf62d5714c5693bdab027
2019-04-15 05:35:19 -07:00
Jorim Jaggi
9aa2d740bd Merge "Fix issue in attached layouting" into qt-dev 2019-04-15 12:33:57 +00:00
Mathew Inwood
5633332ecc Merge "Move some telephony methods to max-sdk-p list."
am: 6c702ac545

Change-Id: I6205948f0ba7d0c0bed76ea583f8bbaeb47452f6
2019-04-15 05:33:27 -07:00
TreeHugger Robot
6243f0aa27 Merge "Add new metrics for ManagedProvisioning." into qt-dev 2019-04-15 12:25:32 +00:00
TreeHugger Robot
59b8b82e74 Merge "Reduce transactions for acquiring and releasing provider" into qt-dev 2019-04-15 12:18:30 +00:00
Mathew Inwood
6c702ac545 Merge "Move some telephony methods to max-sdk-p list." 2019-04-15 12:16:09 +00:00
Alex Kershaw
35443dba90 Merge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev am: d76033fd24" into qt-dev-plus-aosp
am: bef10595ef

Change-Id: Ibd27bfb518bb73718e316e5de25c87ed7cf2d278
2019-04-15 04:42:37 -07:00
Makoto Onuki
eacdf8d567 [automerger skipped] Merge "Update OWNERS" am: abc9b9edcc am: 1636bb34f9 -s ours
am: 43ccb1e990 -s ours
am skip reason: change_id I075ac3ec47743f5d9cd2acbd0cc01ce55cd1a8e3 with SHA1 878cbf8269 is in history

Change-Id: I5d9659ec75f287c1b5806eb5f554396007e72ea9
2019-04-15 04:30:30 -07:00
Android Build Merger (Role)
bef10595ef Merge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev am: d76033fd24" into qt-dev-plus-aosp 2019-04-15 11:19:52 +00:00
Alex Kershaw
4f0a1e369d Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev
am: d76033fd24

Change-Id: I4f5fb3bc5418d616e4b8ef35023eb5086e4d58a1
2019-04-15 04:19:28 -07:00
Makoto Onuki
43ccb1e990 [automerger skipped] Merge "Update OWNERS" am: abc9b9edcc
am: 1636bb34f9 -s ours
am skip reason: change_id I075ac3ec47743f5d9cd2acbd0cc01ce55cd1a8e3 with SHA1 878cbf8269 is in history

Change-Id: I3bbc1363a944b5b374c87bc02a9c45ca419a7aaf
2019-04-15 04:19:13 -07:00
Makoto Onuki
1636bb34f9 Merge "Update OWNERS"
am: abc9b9edcc

Change-Id: I77c5fe25ef1a790c379ff160171946f79fdb316d
2019-04-15 04:07:46 -07:00
TreeHugger Robot
d76033fd24 Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev 2019-04-15 11:01:49 +00:00
Treehugger Robot
abc9b9edcc Merge "Update OWNERS" 2019-04-15 10:46:32 +00:00
Alan Stokes
348fa92ce1 Merge "Tighten rules for blocking activity starts." into qt-dev am: c10e65fb56
am: 0905695692

Change-Id: I511cb6e7b2e9c039d5148925d8a8cbb53bbed849
2019-04-15 03:35:13 -07:00
Alan Stokes
0905695692 Merge "Tighten rules for blocking activity starts." into qt-dev
am: c10e65fb56

Change-Id: I66953f9d1a1bb770e9b8fb30fc4d5e7946796f9b
2019-04-15 03:25:10 -07:00
Kevin Rocard
7771116482 Merge "Add AudioAttributes.getAllowedCapturePolicy" into qt-dev am: 6335a6149a
am: 1113285547

Change-Id: I0a32d44f6a618d49ff0e3aaf60ac3bc1a370b500
2019-04-15 03:21:08 -07:00
Kevin Rocard
1113285547 Merge "Add AudioAttributes.getAllowedCapturePolicy" into qt-dev
am: 6335a6149a

Change-Id: Ied6f71101bace6b8d0704df1281b861c21588055
2019-04-15 03:09:41 -07:00
TreeHugger Robot
c10e65fb56 Merge "Tighten rules for blocking activity starts." into qt-dev 2019-04-15 10:05:21 +00:00
TreeHugger Robot
6335a6149a Merge "Add AudioAttributes.getAllowedCapturePolicy" into qt-dev 2019-04-15 09:45:00 +00:00
Riddle Hsu
76d4c5f8d9 Merge "Ensure to update top process state when launching activity" into qt-dev am: b066ba1699
am: ca2b7525f4

Change-Id: Ibb36cf973b31510cfffc91c43c9b5ef6f00231c4
2019-04-15 01:38:17 -07:00
Kevin Rocard
4fd496d8bf Merge "Add documentation for the APC feature" into qt-dev am: ffc73ad49f
am: db16e64502

Change-Id: I2de8dda40ce8f341f59cfdc77b521f4850508999
2019-04-15 01:32:33 -07:00
Riddle Hsu
ca2b7525f4 Merge "Ensure to update top process state when launching activity" into qt-dev
am: b066ba1699

Change-Id: I402d65f0cab4a8148fe68ec63cb09efbfbb37c77
2019-04-15 01:26:14 -07:00