Commit Graph

95281 Commits

Author SHA1 Message Date
Eric Biggers
937e769728 Merge "Remove the rename() interceptor" 2019-06-25 18:33:00 +00:00
TreeHugger Robot
bbd2a2b56d Merge "Remove deprecated & removed JobInfo methods." 2019-06-25 18:24:17 +00:00
Yin-Chia Yeh
cff1749e52 Merge "Camera: block session init callback until ctor returns" into qt-dev am: 0e1eecd080 am: 0aa57fe073
am: e8ff13376f

Change-Id: I2f5a51b279a67b53a5f0fc5ac0632ce0bf568595
2019-06-25 10:41:56 -07:00
Yin-Chia Yeh
e8ff13376f Merge "Camera: block session init callback until ctor returns" into qt-dev am: 0e1eecd080
am: 0aa57fe073

Change-Id: I26ef69e151344e4ff1c42705b8841f0862802631
2019-06-25 10:08:45 -07:00
Yin-Chia Yeh
0aa57fe073 Merge "Camera: block session init callback until ctor returns" into qt-dev
am: 0e1eecd080

Change-Id: I999510b0513b0b32a86af8e5460aa5688476e9f5
2019-06-25 09:45:42 -07:00
Yin-Chia Yeh
0e1eecd080 Merge "Camera: block session init callback until ctor returns" into qt-dev 2019-06-25 16:26:54 +00:00
Issei Suzuki
a1a6067f2e Merge "Added subtle animation for unlocking screen." into qt-r1-dev am: 0ca1dbcb25
am: 79071973bf

Change-Id: I4612152ed11bab958d8d172e8620ab29dca5c883
2019-06-25 04:51:33 -07:00
Issei Suzuki
79071973bf Merge "Added subtle animation for unlocking screen." into qt-r1-dev
am: 0ca1dbcb25

Change-Id: I08834a57295530c15d19811cccc72174f9f428ad
2019-06-25 04:37:25 -07:00
Issei Suzuki
0ca1dbcb25 Merge "Added subtle animation for unlocking screen." into qt-r1-dev 2019-06-25 11:22:26 +00:00
TreeHugger Robot
00c3a02ac7 Merge "Remove references of the previous surface control in ViewRootImpl" 2019-06-25 01:35:04 +00:00
Eric Biggers
4d556c3f37 Remove the rename() interceptor
Remove the rename() interceptor which was added by change
I7f4461bcacada80398eb95d051a0d29456f63499, since the design of scoped
storage was changed to not use bind mounts.  So, the reason for adding
the rename() interceptor in the first place no longer exists.

Bug: 131115422
Bug: 135278311
Test: atest android.appsecurity.cts.ExternalStorageHostTest#testExternalStorageRename
Change-Id: I0f9ac456104759887c0410fe64acc32cab19b62b
2019-06-24 17:35:19 -07:00
Daniel Rosenberg
58462dd8ca Merge "Merge "Make RescueParty call vold directly" into qt-dev am: 2618371aa5 am: 810274ed2d" into qt-r1-dev-plus-aosp
am: 2afc347abf

Change-Id: I3db4dd79a91bc61d5c24b49a9c9295a61b0ccc00
2019-06-24 15:10:34 -07:00
Daniel Rosenberg
2c8d9ec6d9 Merge "Make RescueParty call vold directly" into qt-dev am: 2618371aa5
am: 810274ed2d

Change-Id: Ibe6be230b5417cec8428516f6edbead1b0146976
2019-06-24 15:05:48 -07:00
Daniel Rosenberg
db5894d5a9 Merge "Make RescueParty call vold directly" into qt-dev
am: 2618371aa5

Change-Id: Id4b104e811a30722ea3c70add3750a9319245ff5
2019-06-24 15:00:57 -07:00
Daniel Rosenberg
810274ed2d Merge "Make RescueParty call vold directly" into qt-dev
am: 2618371aa5

Change-Id: I68af684fa3f8be2cc8d9518eee5bd9dbc1b118cb
2019-06-24 15:00:57 -07:00
Steven Moreland
f7aee2d576 Merge changes Ic2e27f56,Ie19e0995 am: 95f507f80d am: 6245e7efe6 am: df99ad0cf9
am: 18d2e90b1d

Change-Id: I1eb7121a1ec8b428d269b7c786f882b52286c432
2019-06-24 14:56:21 -07:00
Steven Moreland
18d2e90b1d Merge changes Ic2e27f56,Ie19e0995 am: 95f507f80d am: 6245e7efe6
am: df99ad0cf9

Change-Id: I0aa2d7bda198ff9bd73e173eb3d54f7f748ba8dc
2019-06-24 14:50:06 -07:00
Steven Moreland
df99ad0cf9 Merge changes Ic2e27f56,Ie19e0995 am: 95f507f80d
am: 6245e7efe6

Change-Id: Ic44dfe2b3defa6f60bee6062c049ff189223cb50
2019-06-24 14:46:25 -07:00
TreeHugger Robot
2618371aa5 Merge "Make RescueParty call vold directly" into qt-dev 2019-06-24 21:39:40 +00:00
TreeHugger Robot
928f511e9f Merge "Don't create string temporaries if tracing isn't enabled" 2019-06-24 20:49:51 +00:00
Daniel Rosenberg
d078d8b15c Make RescueParty call vold directly
This changes RescueParty to call vold over binder directly for
Checkpointing related calls. It turns out that if the system is in a bad
enough state, the other method would not work, as some of the services
required would not be running.

Bug: 135558798
Test: setprop persist.sys.enable_rescue 1
      setprop debug.crash_system 1 or setprop debug.crash_sysui 1
      vdc checkpoint startCheckpoint 3
      stop
      start
      Device should go through the rescueparty flow, and reboot.
      Repeat without checkpoint. Device should prompt reboot.

Change-Id: I8b11d68075cc291e9557d524bc87b54d17b370e4
2019-06-24 13:23:27 -07:00
Adam He
eec9ed5042 Merge "Fixed event flushing to handle when mDirectServiceInterface is not ready yet." into qt-r1-dev am: e6930c4aa1
am: accfaaa416

Change-Id: I37f6e60f3c28347e00bbfc3d4aeb09845ad00e63
2019-06-24 13:00:33 -07:00
Adam He
accfaaa416 Merge "Fixed event flushing to handle when mDirectServiceInterface is not ready yet." into qt-r1-dev
am: e6930c4aa1

Change-Id: I17671a59667ee8990e7f2ea62c7957d4ed90a966
2019-06-24 12:55:00 -07:00
TreeHugger Robot
e6930c4aa1 Merge "Fixed event flushing to handle when mDirectServiceInterface is not ready yet." into qt-r1-dev 2019-06-24 18:42:45 +00:00
Yin-Chia Yeh
8b9b9f065c Camera: block session init callback until ctor returns
To fix race condition where session init callback is executed
before the ctor finished (and mSessionImpl is initialized)

Test: manuall testing GCA
Bug: 134218348
Change-Id: I6985b489a8cb459d9b1dce4d56a9c3e97ceb366c
2019-06-24 11:32:34 -07:00
Ioannis Ilkos
80d76c5225 Merge "Merge "Add anon RSS + swap metric" into qt-dev am: 9af8d15783 am: 83270da58c" into qt-r1-dev-plus-aosp
am: d3f2c2bf8b

Change-Id: I1568d2c4cc84150749b155f07f35aee689f60924
2019-06-24 09:38:47 -07:00
Ioannis Ilkos
c724ee2de3 Merge "Add anon RSS + swap metric" into qt-dev am: 9af8d15783
am: 83270da58c

Change-Id: I059f5a51d7a7399df9ec4fd26989fc77eb03c734
2019-06-24 08:59:34 -07:00
Ioannis Ilkos
689148acc6 Merge "Add anon RSS + swap metric" into qt-dev
am: 9af8d15783

Change-Id: I00f58e98bb7c162032bf381348a63be4bd77ac0f
2019-06-24 08:16:21 -07:00
Vishnu Nair
eaab0e5aad Remove references of the previous surface control in ViewRootImpl
Partial revert to fix regression from f7645aa9a9 which
kept a strong ref of the old SC used to detect when the SC changed. This meant that during the lifetime of an app it could keep an additional buffer alive.

Bug: 135762652, 132205507
Test: go/wm-smoke
Test: dumpsys meminfo

Change-Id: I93df8b4ef8ffdded6c46fb44ca4cd110038d75d0
2019-06-24 08:12:32 -07:00
Ioannis Ilkos
83270da58c Merge "Add anon RSS + swap metric" into qt-dev
am: 9af8d15783

Change-Id: Icdc2f66054c9f1450a731f051707b3824c487865
2019-06-24 08:11:08 -07:00
Issei Suzuki
5609ccbf95 Added subtle animation for unlocking screen.
Change-Id: Id691fec4f2e492682a53d6855090524f000ddc6c
Bug: 134965724
Bug: 134952761
Test: N/A
2019-06-24 14:25:04 +00:00
TreeHugger Robot
1077ae03f3 Merge "Start process of next activity with top priority in advance" 2019-06-24 09:00:00 +00:00
Ioannis Ilkos
9af8d15783 Merge "Add anon RSS + swap metric" into qt-dev 2019-06-24 08:46:40 +00:00
Lorenzo Colitti
f80234a9b0 Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev
* changes:
  Inline readNetworkStatsDetailInternal, make mUseBpfStats final
  Remove VPN info arrays from NetworkStats(Observer|Recorder)
  NetworkStatsFactory: Take VPNs into account for network/battery stats
  Remove duplicate line in clat_simple test file
  Remove unused lastStats parameter
  Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
2019-06-24 03:37:23 +00:00
Robert Carr
d2076adad2 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev am: 6397ab05f9 am: 641d4f27e3
am: 52277fd25e

Change-Id: I2eda57ef8935733732ed5adc5c9bb2baeeb4ed0c
2019-06-21 18:58:03 -07:00
Steven Moreland
f54791b388 Remove references to setPermissionController.
This method isn't implemented/used/etc..

Bug: 135768100
Test: TH
Change-Id: Ic2e27f5685cc16562815fcaf1226bc7789f8d882
2019-06-21 18:51:07 -07:00
Steven Moreland
3feab1b474 ServiceManagerNative: delete unused methods
This class is never instantiated (and should be deleted in the future),
doesn't need to inherit from anything, and only has one method that is
used (to get an instance of BpServiceManager defined here). Deleting
unused code, and we can delete the class once apps stop linking against
it.

Bug: 135768100
Test: TH
Change-Id: Ie19e099551b10599a4b7bab29b35d78d66cd3442
2019-06-21 18:28:55 -07:00
Robert Carr
52277fd25e Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev am: 6397ab05f9
am: 641d4f27e3

Change-Id: Ic3bfad9182f677251742ade7c430b8f1205a9e65
2019-06-21 17:42:23 -07:00
Robert Carr
641d4f27e3 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev
am: 6397ab05f9

Change-Id: I023b06dc785cbf22783a426060aef55714a457d8
2019-06-21 17:32:54 -07:00
Robert Carr
9e4b7a3f8d Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev
am: 6397ab05f9

Change-Id: I17feac89670b328f88878ce57636cf4954e0c6f3
2019-06-21 17:30:57 -07:00
TreeHugger Robot
6397ab05f9 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev 2019-06-22 00:04:19 +00:00
Kweku Adams
316b14147d Remove deprecated & removed JobInfo methods.
These methods were marked deprecated and tagged with @removed
before Pie shipped but ConnectivityController wasn't updated to perform
the proper computations. This removes the deprecated methods altogether
and updates ConnectivityController accordingly.

Bug: 135214188
Test: atest com.android.server.cts.JobSchedulerIncidentTest
Test: atest com.android.server.job.controllers.ConnectivityControllerTest
Test: atest com.android.providers.downloads.DownloadProviderFunctionalTest
Change-Id: I7c364a4326c31e8aae54a4fc69703434d8c7c915
2019-06-21 11:39:28 -07:00
Antoan Angelov
b39d17720a Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: ab34f61c3b am: 648eb2d3a7
am: 2c612c0a17

Change-Id: Ic954327dcaee6a54ffe3723ff0311b05010cab3e
2019-06-21 11:35:50 -07:00
Antoan Angelov
2c612c0a17 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: ab34f61c3b
am: 648eb2d3a7

Change-Id: I0999d5fde028f595864633400e4368a6f5e4f430
2019-06-21 11:27:49 -07:00
Antoan Angelov
9e3a59f51a Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
am: ab34f61c3b

Change-Id: I49e43ed171d4ff45cf400ac9fc009ef78a2c8eef
2019-06-21 11:22:50 -07:00
Antoan Angelov
648eb2d3a7 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
am: ab34f61c3b

Change-Id: I4b0230f1429e5ca278fa6f5c15babddb1a71cda6
2019-06-21 11:15:06 -07:00
Antoan Angelov
ab34f61c3b Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev 2019-06-21 18:07:22 +00:00
Robert Snoeberger
c96503773c Merge "Handle case that settings string is JSON" into qt-r1-dev am: 6060068d5a
am: be57a19313

Change-Id: I2a4db0e323272f36c1d8d1b9f50238ca0aa073f0
2019-06-21 10:43:48 -07:00
Robert Snoeberger
be57a19313 Merge "Handle case that settings string is JSON" into qt-r1-dev
am: 6060068d5a

Change-Id: I3386b08801beb7356edb37c5485b29188d8a7c3f
2019-06-21 10:07:18 -07:00
Ioannis Ilkos
466ad6c3e0 Add anon RSS + swap metric
We are planning to use this metric to detect leaks.

This CL also decouples the actual memory sampling from AM. This means:
- Less time locking the pid list (we used to lock and then read proc)
- Less serialization / deserialization for the parcel
- Simpler to evolve (e.g. removed the HWM-specific method in AM)

Change-Id: I87a7243156dd8c88cfa85038e7e6cf4963e271e1
Test: manual, MemoryStatUtilTest, UidAtomTests
Bug: b/135418017
2019-06-21 11:10:19 +01:00