Commit Graph

470182 Commits

Author SHA1 Message Date
Automerger Merge Worker
dfb425311b Merge "Prevent start if package is frozen" into rvc-dev am: 08f6ca3915 am: 4146fcc183
Change-Id: I5fe3ea2c666aea72db0ddd2b75be6d279ca973ff
2020-02-28 04:48:37 +00:00
Automerger Merge Worker
4146fcc183 Merge "Prevent start if package is frozen" into rvc-dev am: 08f6ca3915
Change-Id: I3b448e9ba0cd00ce4aff4277b526d8c52d30b76d
2020-02-28 04:39:38 +00:00
TreeHugger Robot
08f6ca3915 Merge "Prevent start if package is frozen" into rvc-dev 2020-02-28 04:24:30 +00:00
Automerger Merge Worker
bea067420d Merge "Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034" into rvc-dev-plus-aosp am: 4ff4d1ac67
Change-Id: Ib9d2e3203159974bd15cb576bce851091ec5c02a
2020-02-28 04:15:37 +00:00
Automerger Merge Worker
4ff4d1ac67 Merge "Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034" into rvc-dev-plus-aosp 2020-02-28 04:04:54 +00:00
Automerger Merge Worker
138966ec15 Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034
Change-Id: If965e1cc95429018696db5ea67f10e362b23c59b
2020-02-28 04:04:49 +00:00
Automerger Merge Worker
53155abf21 Merge "Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034 am: 6279dcd351" into rvc-d1-dev-plus-aosp 2020-02-28 03:49:41 +00:00
Automerger Merge Worker
c291469528 Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034 am: 6279dcd351
Change-Id: I789b5a8da074cdd82bb900c464f5b2b8a820afeb
2020-02-28 03:49:37 +00:00
Automerger Merge Worker
f91937d84d Merge "Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034 am: 245b7d70e9" into rvc-d1-dev-plus-aosp 2020-02-28 03:49:36 +00:00
Automerger Merge Worker
6d7322bea2 Merge "[automerger skipped] Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev am: 71c8e9a0a3 am: 7594c10bd4 -s ours am skip reason: Change-Id Iab9cd5acfeabd114371a8aaaa406a4a1c5919f98 with SHA-1 ef2a4c3859 is in history" into rvc-d1-dev-plus-aosp 2020-02-28 03:49:33 +00:00
Automerger Merge Worker
fd02ecab1b Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034 am: 245b7d70e9
Change-Id: I50209abcfe108658d283033eab7d323f1e7c27c5
2020-02-28 03:49:32 +00:00
Automerger Merge Worker
39731c2334 [automerger skipped] Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev am: 71c8e9a0a3 am: 7594c10bd4 -s ours
am skip reason: Change-Id Iab9cd5acfeabd114371a8aaaa406a4a1c5919f98 with SHA-1 ef2a4c3859 is in history

Change-Id: I679d043a393cbd89b51f7353895079c81f99d687
2020-02-28 03:49:29 +00:00
Automerger Merge Worker
356416e24e [automerger skipped] Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev am: 71c8e9a0a3 -s ours am: f90093fd28 -s ours
am skip reason: Change-Id Iab9cd5acfeabd114371a8aaaa406a4a1c5919f98 with SHA-1 ef2a4c3859 is in history

Change-Id: Ie0ee3df0e6606ee2491e8d917ac9dbf33bd8f159
2020-02-28 03:49:27 +00:00
Automerger Merge Worker
836f43750f Merge "Fix bouncer race condition" into rvc-dev am: 837f5ea60a am: 04f1115d89
Change-Id: I186c2692ae1d976c1a9a6bfa8f6ccbcc6c46a4b8
2020-02-28 03:49:16 +00:00
Automerger Merge Worker
73337c319c Merge "Fix bouncer race condition" into rvc-dev am: 837f5ea60a am: 08b56009b9
Change-Id: I1ebfefc71c242f6568d9f60a37a655664bbf6ba9
2020-02-28 03:49:05 +00:00
Automerger Merge Worker
245b7d70e9 Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034
Change-Id: I2c7932212092df07c88cec7a17f25924ee3edea4
2020-02-28 03:43:08 +00:00
Automerger Merge Worker
6279dcd351 Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034
Change-Id: Ia5ddb245dec7c49ad4c00a778886e928f1ab2d26
2020-02-28 03:42:55 +00:00
Roshan Pius
f5360ee034 Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev 2020-02-28 03:36:22 +00:00
Roshan Pius
b3b559f167 Settings(javadocs): Add alternatives for deprecated settings
Bug: 150219394
Test: Compiles
Change-Id: Ie4dfbfa640a042343e20d2238729444fdc8eadb6
2020-02-28 03:35:12 +00:00
Automerger Merge Worker
7594c10bd4 Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev am: 71c8e9a0a3
Change-Id: I50254db3840dc4be311d194fd93404227d84f00a
2020-02-28 03:33:17 +00:00
Automerger Merge Worker
f90093fd28 [automerger skipped] Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev am: 71c8e9a0a3 -s ours
am skip reason: Change-Id Iab9cd5acfeabd114371a8aaaa406a4a1c5919f98 with SHA-1 ef2a4c3859 is in history

Change-Id: I61ab5feb146adf2af943553b7cd952d2392c8de3
2020-02-28 03:33:07 +00:00
Automerger Merge Worker
04f1115d89 Merge "Fix bouncer race condition" into rvc-dev am: 837f5ea60a
Change-Id: Iea642fff6fd3f2cb869ae25da8090fb5d8436dc1
2020-02-28 03:32:50 +00:00
Automerger Merge Worker
08b56009b9 Merge "Fix bouncer race condition" into rvc-dev am: 837f5ea60a
Change-Id: I3aefa6eb4809564558487804dce41affe59c0f29
2020-02-28 03:32:41 +00:00
TreeHugger Robot
71c8e9a0a3 Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev 2020-02-28 03:30:33 +00:00
TreeHugger Robot
837f5ea60a Merge "Fix bouncer race condition" into rvc-dev 2020-02-28 03:19:35 +00:00
Automerger Merge Worker
3b00df439f Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df am: d74f557cbf am: 0b64d65f28
Change-Id: I36a74a8725e5c6b6b7d471d0414cef7c316119a1
2020-02-28 03:15:16 +00:00
Automerger Merge Worker
0b64d65f28 Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df am: d74f557cbf
Change-Id: I64f6f64c643e626380403d3e15c6ed4b5f2330ef
2020-02-28 03:04:11 +00:00
Automerger Merge Worker
d74f557cbf Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df
Change-Id: Idd4eca225909f88ef6d57fd8952ae497ec82115b
2020-02-28 02:49:58 +00:00
Automerger Merge Worker
0004d4896b Merge "Remove the notification when FGS while-in-use permission is restricted." into rvc-dev am: ccf72664db am: 3a92bf7311
Change-Id: I5a1fa6cec790c0cd30ae192cf703aa3fa830e789
2020-02-28 02:45:22 +00:00
Automerger Merge Worker
d8051bb647 Merge "Create standby bucket changed atom." into rvc-dev am: 169a29772c am: ce18dd17c4
Change-Id: I4510ef5015da9616745f660560af510f931d5012
2020-02-28 02:45:15 +00:00
Automerger Merge Worker
33c851c135 Merge "Merge "Ignore NotificationEntryManagerInflationTests" into rvc-dev am: bd9e2df528 am: 94dda9389f" into rvc-d1-dev-plus-aosp 2020-02-28 02:45:11 +00:00
Automerger Merge Worker
6b53f2835d Merge "Ignore NotificationEntryManagerInflationTests" into rvc-dev am: bd9e2df528 am: 94dda9389f
Change-Id: Ifdb40be76399c575ce458275a40f4de86e038c1a
2020-02-28 02:45:06 +00:00
Automerger Merge Worker
a72ff99556 Merge "Merge "Remove the notification when FGS while-in-use permission is restricted." into rvc-dev am: ccf72664db am: 26c4942b7b" into rvc-d1-dev-plus-aosp 2020-02-28 02:45:05 +00:00
Automerger Merge Worker
21eb9beb2b Merge "Remove the notification when FGS while-in-use permission is restricted." into rvc-dev am: ccf72664db am: 26c4942b7b
Change-Id: I72a33aa35cdeab7ffb17102a8e857aa5067a7791
2020-02-28 02:45:00 +00:00
Automerger Merge Worker
572c5fda8d Merge "Fixes wrong id when granting provider access" into rvc-dev am: d3afc9f1d9 am: b71b7c376f
Change-Id: I3931bff10ff6bd9cd5fe8ef462c5ca13ae0bc326
2020-02-28 02:44:59 +00:00
Automerger Merge Worker
b8cbfd2a04 Merge "Merge "Create standby bucket changed atom." into rvc-dev am: 169a29772c am: a60761c97f" into rvc-d1-dev-plus-aosp 2020-02-28 02:44:58 +00:00
Automerger Merge Worker
070864758a Merge "[automerger skipped] Merge "Bubbles user education for stack & manage" into rvc-dev am: 5688bc3e4c am: 6d486f1f87 -s ours am skip reason: Change-Id I8e6401573c1ac21dfe636aa1132461fe04ce67ac with SHA-1 5a3e94b702 is in history" into rvc-d1-dev-plus-aosp 2020-02-28 02:44:53 +00:00
Automerger Merge Worker
cd604b972a Merge "Create standby bucket changed atom." into rvc-dev am: 169a29772c am: a60761c97f
Change-Id: Ia48fb329e4bee5bd3576c11bac4f8df2ef56db93
2020-02-28 02:44:53 +00:00
Automerger Merge Worker
fc0d7bf3fe [automerger skipped] Merge "Bubbles user education for stack & manage" into rvc-dev am: 5688bc3e4c am: 6d486f1f87 -s ours
am skip reason: Change-Id I8e6401573c1ac21dfe636aa1132461fe04ce67ac with SHA-1 5a3e94b702 is in history

Change-Id: I8206e350fef51b3a812a61f37b69f96bf992a95c
2020-02-28 02:44:49 +00:00
Automerger Merge Worker
801396c585 Merge "Ignore NotificationEntryManagerInflationTests" into rvc-dev am: bd9e2df528 am: e2d2bc8c32
Change-Id: I082c3a9954454c538c7688a9ff32ec2e14f48789
2020-02-28 02:44:44 +00:00
Automerger Merge Worker
f7cd31881d Merge "Merge "Mark updatable APEXes" into rvc-dev am: 71796e31de am: f38631a553" into rvc-d1-dev-plus-aosp 2020-02-28 02:44:43 +00:00
Automerger Merge Worker
8bfce07f1e Merge "Mark updatable APEXes" into rvc-dev am: 71796e31de am: f38631a553
Change-Id: I4054d657837bcf38be3695050f25be508e8fc3c3
2020-02-28 02:44:38 +00:00
Automerger Merge Worker
2592e42a9a Merge "Fixes wrong id when granting provider access" into rvc-dev am: d3afc9f1d9 am: eec9ed09fa
Change-Id: I30d561b897af7a693f70f1c2a1f1844a34abf322
2020-02-28 02:44:36 +00:00
Automerger Merge Worker
031ce770e5 Merge "Bubbles user education for stack & manage" into rvc-dev am: 5688bc3e4c am: 69d008c9c7
Change-Id: I227b4a97325eaf9d2e625ced3f3f2329024936f5
2020-02-28 02:44:27 +00:00
Automerger Merge Worker
26c4942b7b Merge "Remove the notification when FGS while-in-use permission is restricted." into rvc-dev am: ccf72664db
Change-Id: I12f009eb4ff079af4d214b5d593c3cc1200a01cf
2020-02-28 02:44:22 +00:00
Automerger Merge Worker
3a92bf7311 Merge "Remove the notification when FGS while-in-use permission is restricted." into rvc-dev am: ccf72664db
Change-Id: If678436acc1c2147c6bf902351d06b85a63a0615
2020-02-28 02:44:22 +00:00
Automerger Merge Worker
428767f37a Merge "Mark updatable APEXes" into rvc-dev am: 71796e31de am: 522e2529c1
Change-Id: I8615ac73ca47db5069a72198e52035d1e94d8825
2020-02-28 02:44:18 +00:00
Automerger Merge Worker
60819c0104 Merge "Merge "Fix crash when opening bubble overflow" into rvc-dev am: 141b5e79c3 am: 84505b7024" into rvc-d1-dev-plus-aosp 2020-02-28 02:44:03 +00:00
Automerger Merge Worker
a60761c97f Merge "Create standby bucket changed atom." into rvc-dev am: 169a29772c
Change-Id: I5d97ddb4ff52b6459a70bc8972e58f44db26cf60
2020-02-28 02:44:01 +00:00
Automerger Merge Worker
d614c85e31 Merge "Fix crash when opening bubble overflow" into rvc-dev am: 141b5e79c3 am: 84505b7024
Change-Id: I3c260de09b9e2da65cfa57be4ae1e0210d39b22f
2020-02-28 02:43:58 +00:00