Commit Graph
10911 Commits
Author SHA1 Message Date
Steven Morelandandandroid-build-merger f1532a9655 libprocessgroup users use libcutils
am: 46ec20b692

Change-Id: I39a19e98437e210aa14bee4f03c1c69e8f2faa34
2019-06-18 16:48:47 -07:00
Steven Morelandandandroid-build-merger 60f68c7862 libprocessgroup users use libcutils
am: 46ec20b692

Change-Id: If70f26c1294fb892eb517e945a76a120b7b4c324
2019-06-18 16:48:39 -07:00
Steven Moreland 46ec20b692 libprocessgroup users use libcutils
libprocessgroup symbols are being moved into libcutils in order to
optimize linking/memory usage. libprocessgroup will no longer be
required in the future (however removing references to it will come
separately).

Since libcutils is used statically here, the dependencies of
libprocessgroup need to be explicitly listed.

Bug: 135145426
Test: boot
Change-Id: I91c082f0fa2f5f5c52751065cd5f50f5cb965b23
2019-06-18 16:25:23 +00:00
Tianjie Xuandandroid-build-merger 9a6e469e98 Merge "InstallPackage now takes a package as parameter" am: 87e2275970 am: a927a16841 am: f7498516ca
am: 9951cd77ce

Change-Id: I81eba3ab5fc7a7e7ba910ea3b98014ddeab2fb49
2019-06-13 21:20:07 -07:00
Tianjie Xuandandroid-build-merger 9951cd77ce Merge "InstallPackage now takes a package as parameter" am: 87e2275970 am: a927a16841
am: f7498516ca

Change-Id: I904eb7a84395e676f5ec4bddcdc393949524774f
2019-06-13 20:45:17 -07:00
Tianjie Xuandandroid-build-merger f7498516ca Merge "InstallPackage now takes a package as parameter" am: 87e2275970
am: a927a16841

Change-Id: If7c3d8d99bfba0490f2717aef3cedc2cafef4e1a
2019-06-13 19:34:47 -07:00
Tianjie Xuandandroid-build-merger a927a16841 Merge "InstallPackage now takes a package as parameter"
am: 87e2275970

Change-Id: I0ab60eb96946d57f681e9ee2dac87019c57eac5f
2019-06-13 18:47:45 -07:00
Tianjie XuandGerrit Code Review 87e2275970 Merge "InstallPackage now takes a package as parameter" 2019-06-14 00:24:49 +00:00
Elliott Hughesandandroid-build-merger d29fc28f50 Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7 am: a3211f0ecb am: e242d87430
am: 18ff27119d

Change-Id: If87a0d3632d73bad04021d0af37011a90aff33c9
2019-06-13 13:52:20 -07:00
Elliott Hughesandandroid-build-merger 18ff27119d Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7 am: a3211f0ecb
am: e242d87430

Change-Id: I8ff8cb1640f86224395570d84f68c16b4c2c4618
2019-06-13 13:42:14 -07:00
Tianjie Xu 980f92ec00 InstallPackage now takes a package as parameter
Therefore InstallPackage() doesn't need to worry about the details of a
given Package.

Bug: 127071893
Test: run update from /bin/recovery --update_package=@path, sideload a package
Change-Id: I0caa36785b43924f884ee398e7ea640d7472a92e
2019-06-13 13:36:56 -07:00
Elliott Hughesandandroid-build-merger e242d87430 Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7
am: a3211f0ecb

Change-Id: Idfd053e738ab840c4bbdee3b469cbaaa94143c2f
2019-06-13 13:26:27 -07:00
Elliott Hughesandandroid-build-merger a3211f0ecb Merge "Use the new ziparchive Next std::string_view overload."
am: 053ea111a7

Change-Id: I9a7074ffe49d0dd9f81cadc35c74d2dd946e586a
2019-06-13 13:18:28 -07:00
Elliott HughesandGerrit Code Review 053ea111a7 Merge "Use the new ziparchive Next std::string_view overload." 2019-06-13 19:59:18 +00:00
Zhang, GaofengXandandroid-build-merger 1285390323 Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544 am: 6a550f518e am: 7d453edf34
am: 90ced9877c

Change-Id: I5f8b6cc3f4801f14dfc45b15fdc2d10b05b1a2fe
2019-06-12 18:01:16 -07:00
Zhang, GaofengXandandroid-build-merger 90ced9877c Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544 am: 6a550f518e
am: 7d453edf34

Change-Id: I32845dfaddb1bdfea68f0861c0d37b478d84a9e7
2019-06-12 17:32:53 -07:00
Zhang, GaofengXandandroid-build-merger 7d453edf34 Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544
am: 6a550f518e

Change-Id: Id3f87e0a660fbbb9cc87b653c2c894d3b6132eaf
2019-06-12 17:25:25 -07:00
Zhang, GaofengXandandroid-build-merger 6a550f518e Merge "Avoid key_queue_mutex deadlock in waitkey()"
am: eb33356544

Change-Id: I77a49758aefeb521cab18aa66942fa80f6752135
2019-06-12 17:19:43 -07:00
Treehugger RobotandGerrit Code Review eb33356544 Merge "Avoid key_queue_mutex deadlock in waitkey()" 2019-06-13 00:01:49 +00:00
Elliott Hughes 39ac1c013c Use the new ziparchive Next std::string_view overload.
Bug: http://b/129068177
Test: treehugger
Change-Id: Ieec83126e36b330da33092a172e365376cd04dfe
2019-06-12 12:20:37 -07:00
Zhang, GaofengXandXihua Chen 852d9fec6d Avoid key_queue_mutex deadlock in waitkey()
Waitkey() is designed to obtain lock "key_queue_mutex" in
the very beginning of function.

  int RecoveryUI::WaitKey() {
    std::unique_lock<std::mutex> lk(key_queue_mutex);
    ...
  }

However, there's case "key_queue_mutex" being applied again in
waitkey(), thus cause deadlock. There are two reproduce
scenario:
1.Executing "fastboot reboot recovery" in userspace
  fastboot
2.Executing "adb reboot fastboot" in recovery os

When entering userspace fastboot/recovery, waitkey()
will wait there for user action. fastboot/adb commands
will trigger ui->interruptkey() to notify the thread
waitkey() in. In the next, waitkey() will move on and call
SetScreenSaveState(), which do LOG(ERROR) in fail case of
brightness set. LOG(ERROR) is designed to print log on
UI. Unfortunately, UI->print() applies lock "key_queue_mutex"
too, so deadlock happen.

Note:
Here is details how lock "key_queue_mutex" applied in
UI->print():
Function Print() call
   Function PrintV() call
      Function update_screen_locked() call
         Function draw_screen_locked() call
            Function draw_menu_and_test_buffer_locked() call
               Function IsLongPress()

  bool RecoveryUI::IsLongPress() {
    std::lock_guard<std::mutex> lg(key_queue_mutex);
    bool result = key_long_press;
    return result;
  }

Bug: 135078366
Test: no errors when running "fastboot reboot recovery" in userspace
      fastboot & "adb reboot fastboot" in recovery os

Change-Id: Ida6b3c4ba9896a70021373f02a94954f0a60cf31
Signed-off-by: Zhang, GaofengX <gaofengx.zhang@intel.com>
Signed-off-by: Xihua Chen <xihua.chen@intel.com>
2019-06-12 14:48:37 +08:00
android-build-team RobotandAndroid (Google) Code Review 59eac55800 Merge "Snap for 5652667 from e3cc180d31 to qt-qpr1-release" into qt-qpr1-release 2019-06-12 04:17:02 +00:00
android-build-team RobotandAndroid (Google) Code Review 5e18c61962 Merge "Snap for 5652689 from e3cc180d31 to qt-c2f2-release" into qt-c2f2-release 2019-06-12 04:12:24 +00:00
android-build-team RobotandAndroid (Google) Code Review 27f5a96c1b Merge "Snap for 5652689 from e3cc180d31 to qt-c2f2-release" into qt-c2f2-release 2019-06-12 04:07:27 +00:00
android-build-team RobotandAndroid (Google) Code Review e87768a93f Merge "Snap for 5652689 from e3cc180d31 to qt-c2f2-release" into qt-c2f2-release 2019-06-12 04:06:31 +00:00
android-build-team RobotandAndroid (Google) Code Review 3acb74ebc4 Merge "Snap for 5652689 from e3cc180d31 to qt-c2f2-release" into qt-c2f2-release 2019-06-12 04:06:12 +00:00
android-build-team RobotandAndroid (Google) Code Review 7c9a059ecb Merge "Snap for 5652689 from e3cc180d31 to qt-c2f2-release" into qt-c2f2-release 2019-06-12 04:02:40 +00:00
android-build-team RobotandAndroid (Google) Code Review a8fbd52046 Merge "Snap for 5652667 from e3cc180d31 to qt-qpr1-release" into qt-qpr1-release 2019-06-12 03:54:01 +00:00
android-build-team RobotandAndroid (Google) Code Review 09c313ae7a Merge "Snap for 5652667 from e3cc180d31 to qt-qpr1-release" into qt-qpr1-release 2019-06-12 03:52:23 +00:00
android-build-team Robot 383d7fbfd4 Snap for 5652689 from e3cc180d31 to qt-c2f2-release
Change-Id: I72529a59e52bc599a62bc523701e3a46628182a8
2019-06-12 03:36:32 +00:00
android-build-team Robot aa532ad2ae Snap for 5652689 from e3cc180d31 to qt-c2f2-release
Change-Id: I169747f92eede5de61ddaf630b64dc5080ffdfc1
2019-06-12 03:34:04 +00:00
android-build-team Robot 8127089808 Snap for 5652667 from e3cc180d31 to qt-qpr1-release
Change-Id: I87b9aef60fb242db67a05d8070ae7898706b0233
2019-06-12 03:30:41 +00:00
android-build-team Robot bdfbab7c3d Snap for 5652667 from e3cc180d31 to qt-qpr1-release
Change-Id: Ie46693d0aaf8ec8732578c6ed7ee005a9e287443
2019-06-12 03:30:21 +00:00
android-build-team Robot 48d38a678e Snap for 5652689 from e3cc180d31 to qt-c2f2-release
Change-Id: I38326a27161ea1373560ffdbe04ef958b7f2de7e
2019-06-12 03:26:18 +00:00
android-build-team Robot 00a8c46edb Snap for 5652689 from e3cc180d31 to qt-c2f2-release
Change-Id: I6e79526d97e8f4d548d8e969cc431b1c22df1c60
2019-06-12 03:25:06 +00:00
android-build-team Robot f235920792 Snap for 5652689 from e3cc180d31 to qt-c2f2-release
Change-Id: Ibff099e3d6df7791a83ae08be24cee14445b6024
2019-06-12 03:15:02 +00:00
android-build-team Robot 5f755efef5 Snap for 5652667 from e3cc180d31 to qt-qpr1-release
Change-Id: Ib9d586f649fd141c08b4b1cb1c6f54da4bcb6953
2019-06-12 03:12:12 +00:00
android-build-team Robot 0bb08ac13d Snap for 5652689 from e3cc180d31 to qt-c2f2-release
Change-Id: I4ef136cf474919ebe95fcadc3867272cf0d1fcbc
2019-06-12 03:06:21 +00:00
android-build-team Robot d001cb5c2b Snap for 5652667 from e3cc180d31 to qt-qpr1-release
Change-Id: I564fb600ee57b347cb2b6a9c7f88b8d5cbf04728
2019-06-12 03:01:57 +00:00
Tao Baoandandroid-build-merger f13f3bdaff [automerger skipped] minadbd: adb rescue getprop returns newline-terminated result. am: e3cc180d31 -s ours
am: e3a45f93ab -s ours
am skip reason: change_id I5af47f8ea4d569b8507e259daef87749c0945f47 with SHA1 57a27890ce is in history

Change-Id: Ic0709af5e24a965e1e076f6c99aaab01e6d4f033
2019-06-11 15:58:02 -07:00
Tao Baoandandroid-build-merger e3a45f93ab [automerger skipped] minadbd: adb rescue getprop returns newline-terminated result.
am: e3cc180d31 -s ours
am skip reason: change_id I5af47f8ea4d569b8507e259daef87749c0945f47 with SHA1 57a27890ce is in history

Change-Id: I6e660702e7a7880bf709777bce1423e1ab9c145e
2019-06-11 15:49:52 -07:00
Tao Bao e3cc180d31 minadbd: adb rescue getprop returns newline-terminated result.
This change addresses the comment in [1], which makes the results of
`adb shell getprop foo` and `adb rescue getprop foo` more consistent.
That is, both will return newline-terminated results now.

[1] https://r.android.com/c/platform/bootable/recovery/+/976340/3/minadbd/minadbd_services.cpp#188

Fixes: 134027350
Test: Run the following commands on taimen (under rescue mode):
    `adb rescue getprop ro.build.fingerprint`
    `adb rescue getprop ro.nonexistent`
    `adb rescue getprop`
Change-Id: I5af47f8ea4d569b8507e259daef87749c0945f47
Merged-In: I5af47f8ea4d569b8507e259daef87749c0945f47
(cherry picked from commit 57a27890ce)
2019-06-11 12:55:34 -07:00
Tao Baoandandroid-build-merger a431f30259 [automerger skipped] minadbd: Support adb rescue getprop. am: 5359d777e6 -s ours
am: fe097f0253 -s ours
am skip reason: change_id Ic0864ca0fb51505ec1e4f38af2464591aa576201 with SHA1 d8db81a014 is in history

Change-Id: Iab964432c9499dd4e21c61204ffb8596754a474e
2019-06-11 12:08:20 -07:00
Tao Baoandandroid-build-merger 8fd6873932 [automerger skipped] minadbd: More allowed properties. am: 7a31ab675e -s ours
am: da1b196145 -s ours
am skip reason: change_id Id4667fcaf0e908c391085b22e22c957acd01d9c4 with SHA1 3b9ef341be is in history

Change-Id: I368ff9c2d3da5e0b4d24de42c9f48969a1dce015
2019-06-11 12:08:14 -07:00
Tao Baoandandroid-build-merger fe097f0253 [automerger skipped] minadbd: Support adb rescue getprop.
am: 5359d777e6 -s ours
am skip reason: change_id Ic0864ca0fb51505ec1e4f38af2464591aa576201 with SHA1 d8db81a014 is in history

Change-Id: I2c4e8c7af45c56315d9a7e0637813862a9c066b3
2019-06-11 12:03:18 -07:00
Tao Baoandandroid-build-merger da1b196145 [automerger skipped] minadbd: More allowed properties.
am: 7a31ab675e -s ours
am skip reason: change_id Id4667fcaf0e908c391085b22e22c957acd01d9c4 with SHA1 3b9ef341be is in history

Change-Id: Ide33c9019fd42d5d44601f6517db945e8e1514ad
2019-06-11 12:03:13 -07:00
Tao Baoandandroid-build-merger 860448ffec Merge "minadbd: adb rescue getprop returns newline-terminated result." am: cb930939a4 am: d401ed099e am: 4721ced095
am: c6b382bd09

Change-Id: If8c606108f20e1552640281e083d72d43b5ea984
2019-06-10 17:52:27 -07:00
Tao Baoandandroid-build-merger c6b382bd09 Merge "minadbd: adb rescue getprop returns newline-terminated result." am: cb930939a4 am: d401ed099e
am: 4721ced095

Change-Id: I07ad9075ef536532477091672d72f2b98f191e80
2019-06-10 17:31:07 -07:00
Tao Baoandandroid-build-merger 4721ced095 Merge "minadbd: adb rescue getprop returns newline-terminated result." am: cb930939a4
am: d401ed099e

Change-Id: I6dee78abeb9ae1fb07e3809a2acc4c4d6ad31fff
2019-06-10 17:27:56 -07:00
Tao Baoandandroid-build-merger d401ed099e Merge "minadbd: adb rescue getprop returns newline-terminated result."
am: cb930939a4

Change-Id: Ie2a79b2d6254e11f2e419e6fcd799e271a4ebc6a
2019-06-10 17:22:04 -07:00