Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
427,898 Commits 3 Branches 0 Tags
decfc057e600fac3a6266242bee68bd2e8bad95c
Commit Graph

427898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joker.yang
decfc057e6 Merge "Remove LOCAL_SRC_FILES from RRO modules" into stage-aosp-master am: 651b6ee8c5 
am: 278b0462f1

Change-Id: I11c4ffb1a1bd4ddb83d211c73d9fab83aa4c22b6
 2019-07-09 10:07:20 -07:00
joker.yang
278b0462f1 Merge "Remove LOCAL_SRC_FILES from RRO modules" into stage-aosp-master 
am: 651b6ee8c5

Change-Id: I02487eee98057e0358c3136e27c2ac181b0264e7
 2019-07-09 09:57:22 -07:00
TreeHugger Robot
651b6ee8c5 Merge "Remove LOCAL_SRC_FILES from RRO modules" into stage-aosp-master 2019-07-09 16:44:04 +00:00
Fedor Kudasov
431d4415e0 Merge "Return NonNull and other imports" into stage-aosp-master am: ee24c6da27 
am: 6619c84f7f

Change-Id: I2b5f7da15051c57b2050b78100b69e87ebbaf989
 2019-07-09 07:46:55 -07:00
Fedor Kudasov
6619c84f7f Merge "Return NonNull and other imports" into stage-aosp-master 
am: ee24c6da27

Change-Id: Ic584b85e710fbb2486cab27861adedd97789f73b
 2019-07-09 07:37:52 -07:00
Fedor Kudasov
ee24c6da27 Merge "Return NonNull and other imports" into stage-aosp-master 2019-07-09 14:21:09 +00:00
Fedor Kudasov
c064c84b5f Return NonNull and other imports 
Change-Id: Ia38b13209b45d8228ac02f06663e4dc12be9de60
 2019-07-09 14:19:04 +00:00
Fan Zhang
0850a3034c Merge "Update Settingslib owners" am: 90fc97dfcc am: 78081be153 
am: c12516a7ba

Change-Id: I8a535f1cea2fe53361c9cc0541a19f49810095e1
 2019-07-09 06:48:18 -07:00
Fedor Kudasov
10fbf5b18a Merge changes from topic "fix_master_build" am: 2e5319117a am: 8125047183 
am: 95cc083588

Change-Id: I3f5ec7c9b170e5f168a300a86364559ea88e0c93
 2019-07-09 06:42:44 -07:00
Fan Zhang
c12516a7ba Merge "Update Settingslib owners" am: 90fc97dfcc 
am: 78081be153

Change-Id: I6a67434fdeb8fadfc32c98ae6a0d3b9c4aae66f7
 2019-07-09 06:32:45 -07:00
Paul Duffin
47984576b3 [automerger skipped] Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()" am: b63261b60a -s ours am: ba293832e9 -s ours 
am: 41f7dd1cea -s ours
am skip reason: change_id Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a with SHA1 5c3e9d65e3 is in history

Change-Id: I41a61d0f02df38cccdbea762739c15ba4aabd263
 2019-07-09 06:28:56 -07:00
Paul Duffin
2b03edc2a9 [automerger skipped] Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory() am: 5c3e9d65e3 -s ours 
am: 63e3b0cb17 -s ours
am skip reason: change_id Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a with SHA1 c655c5fc2e is in history

Change-Id: Ib0586d718d61c70ffabc62333fd9a8a7f579e55b
 2019-07-09 06:24:17 -07:00
Fedor Kudasov
95cc083588 Merge changes from topic "fix_master_build" am: 2e5319117a 
am: 8125047183

Change-Id: I07f171aa63d97debebfb0a7d86cd0ef53a986d29
 2019-07-09 06:22:48 -07:00
Paul Duffin
41f7dd1cea [automerger skipped] Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()" am: b63261b60a -s ours 
am: ba293832e9 -s ours
am skip reason: change_id Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a with SHA1 5c3e9d65e3 is in history

Change-Id: I5cc93a53899a5ebc5bfe9b91aa0405a351c872ab
 2019-07-09 06:18:53 -07:00
Fan Zhang
78081be153 Merge "Update Settingslib owners" 
am: 90fc97dfcc

Change-Id: Id8196146c744a273331c2c1a6c39fe02274d54cd
 2019-07-09 06:14:19 -07:00
Paul Duffin
63e3b0cb17 [automerger skipped] Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory() 
am: 5c3e9d65e3 -s ours
am skip reason: change_id Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a with SHA1 c655c5fc2e is in history

Change-Id: Ic04a2763f8abd6e8c106560406b80ec633e9df73
 2019-07-09 06:14:17 -07:00
Jorim Jaggi
e2e5f119fb Merge "Launch recents from main thread" into qt-r1-dev 
am: 671ff72e46

Change-Id: If56ac533b92a227a0cd9848e238cc4b3028093fd
 2019-07-09 06:14:15 -07:00
Fedor Kudasov
8125047183 Merge changes from topic "fix_master_build" 
am: 2e5319117a

Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b
 2019-07-09 06:10:01 -07:00
Paul Duffin
ba293832e9 [automerger skipped] Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()" 
am: b63261b60a -s ours
am skip reason: change_id Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a with SHA1 5c3e9d65e3 is in history

Change-Id: If3e5b290e703a0df79eb7d22871627f6a3233584
 2019-07-09 06:05:39 -07:00
Jorim Jaggi
671ff72e46 Merge "Launch recents from main thread" into qt-r1-dev 2019-07-09 12:50:57 +00:00
Paul Duffin
5c3e9d65e3 Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory() 
Test: atest \
    FrameworksServicesTests:com.android.server.pm.PackageInstallerSessionTest
Bug: 117535564

Change-Id: Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a
Merged-In: Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a
(cherry picked from commit c655c5fc2e)
 2019-07-09 11:52:23 +00:00
Treehugger Robot
90fc97dfcc Merge "Update Settingslib owners" 2019-07-09 10:34:33 +00:00
Fedor Kudasov
2e5319117a Merge changes from topic "fix_master_build" 
* changes:
  Revert "Cherry-pick the relevant parts of master change"
  Revert "Remove providesRoutesToMostDestinations."
 2019-07-09 09:32:23 +00:00
Fedor Kudasov
559e91e0ef Revert "Cherry-pick the relevant parts of master change" 
This reverts commit dd16d44fe8.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b
 2019-07-09 09:29:17 +00:00
Fedor Kudasov
e5cb0a2216 Revert "Remove providesRoutesToMostDestinations." 
This reverts commit d85b09a06f.

Reason for revert: multiple build breakages b/137069068

Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff
 2019-07-09 09:23:25 +00:00
Treehugger Robot
b63261b60a Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()" 2019-07-09 09:10:28 +00:00
Neil Fuller
cc83885699 Merge "Switch widgets away from android.text.format.Time" am: db31e6d07a am: 8d96e17940 
am: 19d4f4eb32

Change-Id: I65336bde8f7730cb3aea8f436d5e301d808c52e6
 2019-07-09 02:05:28 -07:00
Neil Fuller
19d4f4eb32 Merge "Switch widgets away from android.text.format.Time" am: db31e6d07a 
am: 8d96e17940

Change-Id: I497266b9a4805b356ebab6deca215020627cfd6e
 2019-07-09 01:56:25 -07:00
Neil Fuller
8d96e17940 Merge "Switch widgets away from android.text.format.Time" 
am: db31e6d07a

Change-Id: I550b2c7ac5e3e5b07eda51c190c354e5236a561e
 2019-07-09 01:38:01 -07:00
Chalard Jean
c900f7e69b Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c am: cbaed4e7ba 
am: 40b8170b09

Change-Id: I11fcb4a1fbf5ccb46c41469529b3d5dfbbbdd394
 2019-07-09 01:19:20 -07:00
Neil Fuller
db31e6d07a Merge "Switch widgets away from android.text.format.Time" 2019-07-09 08:15:10 +00:00
Chalard Jean
40b8170b09 Merge changes Ia43f8811,I7de4f672 am: 3ef04b8e3c 
am: cbaed4e7ba

Change-Id: I61c1649e4dd6ae7f9e522fede22f678863ee603f
 2019-07-09 01:10:24 -07:00
Chalard Jean
cbaed4e7ba Merge changes Ia43f8811,I7de4f672 
am: 3ef04b8e3c

Change-Id: Ifcacd81d343a29b17fdb79f4c8b54c89a293a2b8
 2019-07-09 00:56:57 -07:00
Fan Zhang
d9a00a964f Update Settingslib owners 
Test: rebuilt
Change-Id: Ic6b002a181f77e598801462799918cddce8c91ea
 2019-07-09 00:51:59 -07:00
Chalard Jean
3ef04b8e3c Merge changes Ia43f8811,I7de4f672 
* changes:
  Remove providesRoutesToMostDestinations.
  Cherry-pick the relevant parts of master change I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict
 2019-07-09 07:30:11 +00:00
Android Build Merger (Role)
420ca02e20 Merge "Specify the duration time base am: 6f672a3835 am: 7922ef60fc" into qt-r1-dev-plus-aosp 2019-07-09 02:45:48 +00:00
Svet Ganov
b83d9c1c2d Specify the duration time base am: 6f672a3835 
am: 947aeb09d9

Change-Id: Ibf0123753fe765deb1d2c6942ca8f5bf8926cb7c
 2019-07-08 19:44:58 -07:00
Svet Ganov
3cd3dbd1f4 Specify the duration time base am: 6f672a3835 
am: 7922ef60fc

Change-Id: Id9d9ebdfd96a1c534aedd0152ebe1a92a51f225c
 2019-07-08 19:44:58 -07:00
Svet Ganov
947aeb09d9 Specify the duration time base 
am: 6f672a3835

Change-Id: I647068b041eb06a3814cface4b4dce50bc7ff2e7
 2019-07-08 19:33:03 -07:00
Svet Ganov
7922ef60fc Specify the duration time base 
am: 6f672a3835

Change-Id: I55a7866ab35c6c652b378ced6cea8c63c1a14016
 2019-07-08 19:32:25 -07:00
Kalesh Singh
eca44acac0 [automerger skipped] Merge "Add SystemSuspend HAL to ANR list." am: 10df4fcaa7 -s ours am: b57beb6430 -s ours 
am: 029d899c0d -s ours
am skip reason: change_id I6be189f11193f12351fcf07c6583dce3402de28d with SHA1 06ba1b2d50 is in history

Change-Id: Ib440272583ad8204939d393483aee300a4bf751f
 2019-07-08 19:12:01 -07:00
Kalesh Singh
029d899c0d [automerger skipped] Merge "Add SystemSuspend HAL to ANR list." am: 10df4fcaa7 -s ours 
am: b57beb6430 -s ours
am skip reason: change_id I6be189f11193f12351fcf07c6583dce3402de28d with SHA1 06ba1b2d50 is in history

Change-Id: Id544adb5c9545f1f9f670ba4c4607eb3a2fc1d4d
 2019-07-08 19:01:03 -07:00
Kalesh Singh
b57beb6430 [automerger skipped] Merge "Add SystemSuspend HAL to ANR list." 
am: 10df4fcaa7 -s ours
am skip reason: SHA1 10df4fcaa7 skipped by user kaleshsingh

Change-Id: Ib6c9103ef7520e8489b6c7765a76abf8b885afbc
 2019-07-08 18:41:09 -07:00
Tomasz Wasilczyk
8f0da80b26 Merge "Fix bad arguments handling" am: 79a2b5215d am: 8c64a5a4ff 
am: 70e4d3c3a2

Change-Id: Iab78aec4281338c13d99cf9ab168699d1c24915c
 2019-07-08 18:08:30 -07:00
Andreas Gampe
8d32fefac4 Merge changes I52110b84,I15d10a19,I5f52b832,Ifbaceb47 am: 803648a957 am: d89768f5a2 
am: 8413d3041b

Change-Id: I3ee94f84d340c56b15dac6d8e0aa419c9fc41a64
 2019-07-08 17:54:54 -07:00
Brett Chabot
e270b11375 [automerger skipped] Migrate BackgroundDexOptServiceIntegrationTests to androidx.test am: 3bc264d1a0 -s ours am: f1383e0c59 -s ours 
am: a06b665bef -s ours
am skip reason: change_id I32fe3297656eec6060da6c7e24582bcd5315fb16 with SHA1 502ec7ae4b is in history

Change-Id: I5733c79b725157e5a569eb222b49d15783392ae8
 2019-07-08 17:54:42 -07:00
Nikita Ioffe
625460279a [automerger skipped] Merge "Use ApexInfo.moduleName" am: 760e80c1e9 -s ours am: a3c24462e8 -s ours 
am: 207dc1d938 -s ours
am skip reason: change_id If0bd3d368c7373ab0028211a8a4246a9821893af with SHA1 b4eee2a17d is in history

Change-Id: I6300194f8289e0cb7d87cc506c307531e83f39f5
 2019-07-08 17:32:10 -07:00
Chalard Jean
24346153c9 Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest." am: b268cb5c6e am: 81d9d197a3 
am: 393826d56e

Change-Id: Id90f1ca9fe90efc20d40cc31b495209b1981fdd6
 2019-07-08 17:25:40 -07:00
Tomasz Wasilczyk
70e4d3c3a2 Merge "Fix bad arguments handling" am: 79a2b5215d 
am: 8c64a5a4ff

Change-Id: If077f431c0e61691f2a8a8ffe2960a557050b198
 2019-07-08 17:25:34 -07:00
Andreas Gampe
8413d3041b Merge changes I52110b84,I15d10a19,I5f52b832,Ifbaceb47 am: 803648a957 
am: d89768f5a2

Change-Id: I55b9421bc2e4f309e6705b349a77d4ec9fd3839d
 2019-07-08 17:20:30 -07:00