Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
486,272 Commits 3 Branches 0 Tags
d3eb223b7ed245dd3af8e5b47ee1bb9d9fe9748b
Commit Graph

486272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyunglyul Hyun
d3eb223b7e Merge "Send last discovery preference to provider service" into rvc-dev am: c9d20f317d 
Change-Id: I8b09e11ca3e84e44e4d7d8c73854b680ea38d1ac
 2020-05-19 06:55:55 +00:00
Kyunglyul Hyun
c9d20f317d Merge "Send last discovery preference to provider service" into rvc-dev 2020-05-19 06:32:57 +00:00
TreeHugger Robot
8c1c72eaa0 Merge "Update string for 3.5mm and usb audio device" into rvc-dev am: 29ab886b04 
Change-Id: I27dfda3dc436a521eac42c416ba969da4ddbe722
 2020-05-19 05:49:16 +00:00
TreeHugger Robot
29ab886b04 Merge "Update string for 3.5mm and usb audio device" into rvc-dev 2020-05-19 05:33:48 +00:00
Treehugger Robot
66b74f632f [automerger skipped] Merge "Add a test to check unusual home activities" am: c3076ed3b2 am: 74e9ef34c3 -s ours 
am skip reason: Change-Id I6f190ae33fc9e724adc0e53d07107e9a1ae0291f with SHA-1 c8607a3a5b is in history

Change-Id: I7c1c8e592f24565bd8246ef1107790f7de57426f
 2020-05-19 05:06:03 +00:00
Chen Xu
fd2b3141a9 Merge "allow CBR to write SMS database" into rvc-dev am: b44d6d6d48 
Change-Id: I3c46cf90de5ca91a30fb603e8bc8f882bbb32b09
 2020-05-19 05:01:16 +00:00
Treehugger Robot
74e9ef34c3 Merge "Add a test to check unusual home activities" am: c3076ed3b2 
Change-Id: I0c388e6cf930297d99b8a2af448c4b8154c1a557
 2020-05-19 04:49:37 +00:00
Chen Xu
b44d6d6d48 Merge "allow CBR to write SMS database" into rvc-dev 2020-05-19 04:41:50 +00:00
Treehugger Robot
c3076ed3b2 Merge "Add a test to check unusual home activities" 2020-05-19 04:31:35 +00:00
Treehugger Robot
4d6ac2e133 [automerger skipped] Merge "Revert "Add a null home activity to Shell.apk"" am: fa8eb3f146 am: 2aabf5f792 -s ours 
am skip reason: Change-Id I927b7dae779da25589f2198e0480c0f2a788a7e4 with SHA-1 539298c1b9 is in history

Change-Id: I0dd072967f37835146a9e4199837946a36cb60b1
 2020-05-19 04:00:00 +00:00
Mehdi Alizadeh
596e8fdccf Merge "Adds back inset scale value to main config.xml" into rvc-dev am: 799b92b2d5 
Change-Id: I3202334042433a36151c6cdb8de2d702ebf67a25
 2020-05-19 03:59:47 +00:00
Treehugger Robot
2aabf5f792 Merge "Revert "Add a null home activity to Shell.apk"" am: fa8eb3f146 
Change-Id: I29823d88ad54c5c8cf67ebc100d0d00f8c7282fd
 2020-05-19 03:47:24 +00:00
Mehdi Alizadeh
799b92b2d5 Merge "Adds back inset scale value to main config.xml" into rvc-dev 2020-05-19 03:31:52 +00:00
Treehugger Robot
fa8eb3f146 Merge "Revert "Add a null home activity to Shell.apk"" 2020-05-19 03:29:23 +00:00
Treehugger Robot
824fab6ed3 Merge "TetheringServiceTest: test caller permission" am: 342a73c40c am: 085e1c80ec 
Change-Id: Ia1c0ec986750a04290d3125882d00c18f4213ae7
 2020-05-19 03:21:42 +00:00
Treehugger Robot
085e1c80ec Merge "TetheringServiceTest: test caller permission" am: 342a73c40c 
Change-Id: I5064eb5e27d7803c0f86b75c391b56f1e3cb4d7d
 2020-05-19 03:07:55 +00:00
Isaac Chen
498e571c9c Add a test to check unusual home activities 
Framework's SystemUserHome and Shell's NullHome activities have no real
Home function and should only be used in bootable CSI products. They
should not exist or be enabled on normal products.

This test can help to find if they exist in the system without needing
to find them via Settings manually.

Bug: 149307007
Bug: 149780604
Bug: 154723738
Test: # On aosp_crosshatch with Shell's NullHome activity
      $ atest NullHomeTest
      ...
      arm64-v8a NullHomeTest
      ----------------------
      com.android.test.nullhome (1 Test)
      [1/1] com.android.test.nullhome.NullHomeTest#checkNullHome: FAILED (127ms)
      # On aosp_crosshatch without Shell's NullHome activity
      $ atest NullHomeTest
      ...
      arm64-v8a NullHomeTest
      ----------------------
      com.android.test.nullhome (1 Test)
      [1/1] com.android.test.nullhome.NullHomeTest#checkNullHome: PASSED (2ms)
Change-Id: I6f190ae33fc9e724adc0e53d07107e9a1ae0291f
Merged-In: I6f190ae33fc9e724adc0e53d07107e9a1ae0291f
(cherry picked from commit c8607a3a5b)
 2020-05-19 10:59:30 +08:00
Philip P. Moltmann
74d33d3c1c Merge "Check dump permission for "dumpsys permissionmgr"" into rvc-dev am: 088ef5e3ff 
Change-Id: If7bed98ea906c6839bbf391e18cdd750e7e3976e
 2020-05-19 02:56:11 +00:00
Philip P. Moltmann
088ef5e3ff Merge "Check dump permission for "dumpsys permissionmgr"" into rvc-dev 2020-05-19 02:54:21 +00:00
Henry Fang
8e483795ad Merge "Added 1st atom for Tuner Metrics" into rvc-dev am: d026dffb65 
Change-Id: If7c017982f1838da8af1ac78431ea0b3ab9b7182
 2020-05-19 02:47:09 +00:00
Chris Li
c0c37b5757 Merge "Use getOrCreateRootHomeTask in ActivityStartController" into rvc-dev am: eafbb325eb 
Change-Id: I295e6d23ae0c4287be98db6e04f8c2138fc4b67f
 2020-05-19 02:46:43 +00:00
TreeHugger Robot
e46c0db9e6 Merge "Define BytesTransferByTagAndMetered atom" into rvc-dev am: 240e8f5544 
Change-Id: I9b74a833870bd1e291c0c52e229f079fea46a180
 2020-05-19 02:46:02 +00:00
Henry Fang
d026dffb65 Merge "Added 1st atom for Tuner Metrics" into rvc-dev 2020-05-19 02:44:27 +00:00
Treehugger Robot
342a73c40c Merge "TetheringServiceTest: test caller permission" 2020-05-19 02:40:03 +00:00
Chris Li
eafbb325eb Merge "Use getOrCreateRootHomeTask in ActivityStartController" into rvc-dev 2020-05-19 02:35:26 +00:00
Isaac Chen
5bc026a72d Revert "Add a null home activity to Shell.apk" 
This reverts commit 6b1c4a9e09.

Bug: 149226068
Bug: 149307007
Bug: 149780604
Test: $ lunch aosp_crosshatch-userdebug; m
      # flash and boot on a crosshatch
      # Settings -> Apps & notifications -> Default apps -> Home apps
      # Only Quickstep home is there; no Shell home any more
      $ lunch csi_arm64-userdebug; m
      # flash the resulted system.img on a crosshatch and boot
      $ atest DeviceHealthTests # all passed
Change-Id: I927b7dae779da25589f2198e0480c0f2a788a7e4
Merged-In: I927b7dae779da25589f2198e0480c0f2a788a7e4
(cherry picked from commit 539298c1b9)
 2020-05-19 10:30:23 +08:00
TreeHugger Robot
240e8f5544 Merge "Define BytesTransferByTagAndMetered atom" into rvc-dev 2020-05-19 02:23:30 +00:00
JW Wang
8b8b7292a0 Merge "Add logs for debugging flaky test" into rvc-dev am: 33285aff67 
Change-Id: Ia2721854c6ae3d5016f0809ea3406f0a1c30c624
 2020-05-19 02:06:46 +00:00
JW Wang
33285aff67 Merge "Add logs for debugging flaky test" into rvc-dev 2020-05-19 02:03:59 +00:00
TreeHugger Robot
542cec2365 Merge "Report resizeTask failure as boolean result" into rvc-dev am: 58657c7c10 
Change-Id: I2d75dfed853f36bdae949b2f02f3e2e32a4dba8a
 2020-05-19 01:57:40 +00:00
Treehugger Robot
8434b134eb [automerger skipped] Merge "[ProgressBar] Fix: Media volume bar indicates a wrong value" am: 4a9f0495ee am: 2dbccd05dc -s ours 
am skip reason: Change-Id I569dbea4c6346ecfff8141d8378b4952fb1fa530 with SHA-1 18a6c10e71 is in history

Change-Id: Iaf1b2dea0b702b7b146349479ed53c2c333521e6
 2020-05-19 01:52:42 +00:00
TreeHugger Robot
58657c7c10 Merge "Report resizeTask failure as boolean result" into rvc-dev 2020-05-19 01:39:54 +00:00
Treehugger Robot
2dbccd05dc Merge "[ProgressBar] Fix: Media volume bar indicates a wrong value" am: 4a9f0495ee 
Change-Id: I46229f54fc2bc093d3326fd679625aca30ccefc9
 2020-05-19 01:38:40 +00:00
Treehugger Robot
4a9f0495ee Merge "[ProgressBar] Fix: Media volume bar indicates a wrong value" 2020-05-19 01:32:33 +00:00
TreeHugger Robot
737e0c322b Merge "Adds test to verify cached shortcuts don't count against the limit" into rvc-dev am: e0fb2c72ce 
Change-Id: I423185f23f04cade6ea276e10452a7895aeeb00d
 2020-05-19 01:27:40 +00:00
TreeHugger Robot
e0fb2c72ce Merge "Adds test to verify cached shortcuts don't count against the limit" into rvc-dev 2020-05-19 01:13:21 +00:00
Paul Duffin
6907e0aeff [automerger skipped] Merge "Add missing metalava options to framework-module-defaults" am: b5cde11961 am: 4b13bcbd42 -s ours 
am skip reason: Change-Id I7a852149e3e12c3cb9083b2d0ca483cc55f6348f with SHA-1 56195fba42 is in history

Change-Id: I368c6075eb9f52450dc69d350d185e3d8874d3ed
 2020-05-19 01:08:21 +00:00
markchien
aebd81875e TetheringServiceTest: test caller permission 
Bug: 154869719
Test: atest TetheringTests
Change-Id: I7beea3f011d930e433443ed62d772a3f8cce5d78
 2020-05-19 09:04:43 +08:00
Paul Duffin
4b13bcbd42 Merge "Add missing metalava options to framework-module-defaults" am: b5cde11961 
Change-Id: Ib99fcccf335e82119e73d649dfa3e0a9fb3df3a3
 2020-05-19 00:53:29 +00:00
Gopalakrishnan Nallasamy
700fa1f40d Merge "MediaMuxer:Maintain proper state after stop()" into rvc-dev am: 7f42b75525 
Change-Id: Iaee04c01e89ad33cd71e15ab9211ea88cd209ba7
 2020-05-19 00:49:06 +00:00
Paul Duffin
b5cde11961 Merge "Add missing metalava options to framework-module-defaults" 2020-05-19 00:41:48 +00:00
Alan Viverette
628d626460 Merge "[ProgressBar] Fix: Media volume bar indicates a wrong value" into rvc-dev-plus-aosp 2020-05-19 00:38:41 +00:00
Gopalakrishnan Nallasamy
7f42b75525 Merge "MediaMuxer:Maintain proper state after stop()" into rvc-dev 2020-05-19 00:33:30 +00:00
Amit Mahajan
963957ed4d Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c am: 67bec2d79b 
Change-Id: I2395255c3da76bb1da99fe243a280c65ba9baf95
 2020-05-19 00:16:28 +00:00
Mehdi Alizadeh
dd9f8b3bf1 Adds test to verify cached shortcuts don't count against the limit 
Bug: 148560891
Test: atest ShortcutManagerTest1
Change-Id: I2bf22294839c691166bbf0295d6b15ebd4c959a1
 2020-05-18 23:56:54 +00:00
Amit Mahajan
67bec2d79b Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c 
Change-Id: I50ca70c0e9a3a20bc64604e9e05cec619111679f
 2020-05-18 23:55:10 +00:00
Mehdi Alizadeh
771557666d Adds back inset scale value to main config.xml 
Bug: 152364314
Test: Manual
Change-Id: I6ba7c935e86bdc463c15094171d12edd834b0228
 2020-05-18 23:52:10 +00:00
Amit Mahajan
62120dcc8c Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." 2020-05-18 23:38:22 +00:00
Beverly Tai
3e5788f7e6 Merge "Revert "Don't readd pending notifs to NEM's allNotifs list"" into rvc-dev am: a1ad29da2d 
Change-Id: Id4b3e6fc2b1ae99dbc68256aafd4749a1a9d9ffe
 2020-05-18 23:16:06 +00:00
Mike Digman
f5f2c3f413 Merge "Add pinned target indicator to Sharesheet, update visuals" into rvc-dev am: aa96eb5733 
Change-Id: I952e52cd4384ab5a5c56557e4a64241012286b90
 2020-05-18 23:15:37 +00:00