Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
403,738 Commits 3 Branches 0 Tags
f5ce5eddaea62cfdf36d5502ba2b87bc961780eb
Commit Graph

403738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f5ce5eddae Merge "idmap2: introduce improved Result class" 2019-02-07 19:01:38 +00:00
TreeHugger Robot
f86397d721 Merge "Fix flaky WindowStateTests" 2019-02-07 18:47:43 +00:00
Chad Brubaker
1189c0f9e8 Merge "Remove usage info" 2019-02-07 18:08:04 +00:00
Andrei-Valentin Onea
509d87c201 Merge "Add whitelist atom field option Whitelisted atoms can be triggered from any source Test: stats-log-api-gen-test Bug: 119217680 Change-Id: Ia5faed04d696b59ba4ffaab13f5046f943d8a8b7" 2019-02-07 18:07:24 +00:00
Olivier Gaillard
f0cdc78790 Merge "Flush the bucket before creating a partial bucket." 2019-02-07 17:49:41 +00:00
TreeHugger Robot
41c7343483 Merge "idmap2: include AndroidManifest.xml in CRCs" 2019-02-07 17:36:12 +00:00
Mårten Kongstad
9371dc17e4 idmap2: include AndroidManifest.xml in CRCs 
The CRCs stored in the idmap file header are copies of the zip file CRC for the
resources.arsc entry in the target and overlay package apks, and are used to
quickly check if either package's contents has changed, which in turn means the
idmap file must be recreated.

With the introduction of named targets, just checking the resources.arsc file is no
longer sufficient: an overlay package could be installed with targetName="a" and
updated to targetName="b". This change is not reflected in the resources.arsc file,
only in the AndroidManifest.xml.

To account for this, update the CRC in the idmap file header from

    CRC(resources.arsc)

to

    CRC(resources.arsc) ^ CRC(AndroidManifest.xml)

Test: make idmap2_tests
Bug: 119761809
Change-Id: Ieb0c6b466ac23eb81a2670a32309fa46ade5c5c8
 2019-02-07 17:33:19 +00:00
Andrei-Valentin Onea
74d6997124 Merge "Fix regression in Dalvik:HEAP_TOTAL" 2019-02-07 16:16:38 +00:00
Christine Franks
a5c5ced49f Merge "Replace ColorDisplayController references" 2019-02-07 16:11:14 +00:00
Fabian Kozynski
941d762989 Merge "Fix intents in OngoingPrivacyDialog" 2019-02-07 16:07:52 +00:00
Olivier Gaillard
808bfd196f Flush the bucket before creating a partial bucket. 
- this is consistent with what we do in onConditionChanged, we first
call flushBucketIfNecessary and then pull the data
- fixed a bug when partial bucket is not created and previous full
bucket is dropped

There are lots of tests changed because the bucket is now flushed after
onDataPulled. Also the interval value/base change because of the flush
so the value has already become the base and the intervals have been
trimmed.

Test: atest statsd_test
Bug: 123985255
Change-Id: Ia1b07106656c1fb12e3d761c69998cde86d72239
 2019-02-07 15:59:56 +00:00
TreeHugger Robot
74c7cb942f Merge "Make the alert button 'default' instead of 'high'" 2019-02-07 15:54:04 +00:00
Olivier Gaillard
31e6a70ca1 Merge "Track the number of buckets dropped." 2019-02-07 14:57:38 +00:00
Olivier Gaillard
c63d6c2aa7 Merge "Fix test: the event should be from the previous bucket" 2019-02-07 13:16:05 +00:00
Yunfan Chen
5e696f1c64 Fix flaky WindowStateTests 
The test testVisibleWithInsetsProvider was flaky because the provider
cannot control the visibility if the USE_NEW_INSETS_PROPERTY in system
property is not NEW_INSETS_MODE_FULL. In order to test the provider
visibility controlling functionality, we need to make the top bar insets
controllable.

To do so, we need to update sNewInsetsMode in ViewRootImpl for the
test.

Test: atest WindowStateTests
Bug: 74078662
Bug: 69229402
Change-Id: If6aba86e3c5a55dd0976ddda3a93f003ebaf5712
 2019-02-07 22:02:08 +09:00
Olivier Gaillard
320952bf7d Track the number of buckets dropped. 
Test: atest statsd_test
Change-Id: I56973d2c87aaed0f1c4a6908682cc54cda39eceb
 2019-02-07 12:58:55 +00:00
Nandana Dutt
2d0c0e786f Merge "Revert "Remove the IncidentHeaderProto dependency from statsd."" 2019-02-07 12:26:08 +00:00
Nandana Dutt
9ed7c41017 Revert "Remove the IncidentHeaderProto dependency from statsd." 
This reverts commit df6255a0c1.
Reason for revert: Breaks git master
Test: manual confirm

Change-Id: Ifd8f437dce826fe7d8f875fc838a250fc010049a
 2019-02-07 12:24:32 +00:00
Louis Pullen-Freilich
65650acdbc Merge "Adds FlingRunnable to dark-greylist" 2019-02-07 12:16:58 +00:00
TreeHugger Robot
7de59d53da Merge "Remove unused codepath." 2019-02-07 12:16:43 +00:00
Sergey Vasilinets
9481a0781a Merge "Add maxTargetSdk to @UnsupportedAppUsage for mH, mServedView, mNextServedView" 2019-02-07 11:31:32 +00:00
Olivier Gaillard
3061ca2381 Fix test: the event should be from the previous bucket 
Test: atest statsd_test
Change-Id: I2da34ba542bf8552cdb79314fde4cecc279bad70
 2019-02-07 11:14:58 +00:00
Richard Uhler
a32d905c36 Merge "Don't fail rollback for missing installer packages." 2019-02-07 11:03:45 +00:00
Nikita Iashchenko
e1370d6215 Merge "Deprecate BreakIterator.getTitleInstance() functions and KIND_TITLE field" am: 21b38267fa am: 5d7d81f02e 
am: 4e535813e8

Change-Id: I2d1dfed4a71c708f3da05c51a0f0716e252751f9
 2019-02-07 02:58:57 -08:00
Zimuzo Ezeozue
3ba176eeb2 Merge "Fix RollbackTest#testBadUpdateRollback" 2019-02-07 10:47:49 +00:00
Nikita Iashchenko
4e535813e8 Merge "Deprecate BreakIterator.getTitleInstance() functions and KIND_TITLE field" am: 21b38267fa 
am: 5d7d81f02e

Change-Id: I83a1a4e4feccbe6f17359e369769c08ae4017c5c
 2019-02-07 02:45:53 -08:00
Nikita Iashchenko
5d7d81f02e Merge "Deprecate BreakIterator.getTitleInstance() functions and KIND_TITLE field" 
am: 21b38267fa

Change-Id: I0e938e39625f03d7fd3022ef3b7326b73d4e9ad4
 2019-02-07 02:34:28 -08:00
Treehugger Robot
21b38267fa Merge "Deprecate BreakIterator.getTitleInstance() functions and KIND_TITLE field" 2019-02-07 10:20:01 +00:00
Alan Stokes
c23b6ee454 Merge "Don't record loading of APKs as dynamic code." 2019-02-07 09:37:24 +00:00
Bram Bonné
af4ba04daf Merge "Ports DiffScriptBackupWriter from gmscore to AOSP." 2019-02-07 09:36:51 +00:00
Android Build Merger (Role)
1fc8cdeae0 Merge "Merge "Move hiddenapi rules to Soong" am: af931e60dc am: aec5032673 am: 21a159ff99" 2019-02-07 08:17:29 +00:00
Colin Cross
3fd591a50f Merge "Move hiddenapi rules to Soong" am: af931e60dc am: aec5032673 
am: 21a159ff99

Change-Id: Ifd46909fe4faf0a4127cb6ca8d1349ad7d48fcdc
 2019-02-07 00:16:22 -08:00
Anton Hansson
b71394a63d Merge "Remove privapp permission grant for dmservice" 2019-02-07 08:07:28 +00:00
Colin Cross
21a159ff99 Merge "Move hiddenapi rules to Soong" am: af931e60dc 
am: aec5032673

Change-Id: Ic38ec845583e1b8e5351aec365da613b72d011e3
 2019-02-06 23:58:28 -08:00
Colin Cross
aec5032673 Merge "Move hiddenapi rules to Soong" 
am: af931e60dc

Change-Id: I088ccd0d482b0c787eefe86e76e586678e2905d3
 2019-02-06 23:45:30 -08:00
Treehugger Robot
af931e60dc Merge "Move hiddenapi rules to Soong" 2019-02-07 07:27:33 +00:00
Chih-hung Hsieh
d8b390c88b Merge "Add default code reviewers into OWNERS" am: e45eefe8ec am: 3a59c9f70e 
am: f59468295e

Change-Id: I1f5055c6c83f1659b4a75cc4af2008d89c622195
 2019-02-06 22:51:55 -08:00
Chih-hung Hsieh
f59468295e Merge "Add default code reviewers into OWNERS" am: e45eefe8ec 
am: 3a59c9f70e

Change-Id: I65f8c7aa64ee34388341c6e8687adc3dbdcfa595
 2019-02-06 22:42:47 -08:00
Chih-hung Hsieh
3a59c9f70e Merge "Add default code reviewers into OWNERS" 
am: e45eefe8ec

Change-Id: I036a2961165c70fad39395b87d452f2087126c95
 2019-02-06 22:34:54 -08:00
Chih-hung Hsieh
e45eefe8ec Merge "Add default code reviewers into OWNERS" 2019-02-07 06:21:24 +00:00
Chih-Hung Hsieh
34cd77a651 Add default code reviewers into OWNERS 
Bug: 33166666
Test: gerrit uploader
Change-Id: Ief5d4bf9005bb3a712803101f98dd2b876662eb8
 2019-02-06 22:19:19 -08:00
Lajos Molnar
f18f491880 Merge changes I4d349d67,I504594d0 
* changes:
  media: retain codec name for MediaCodec.getCodecInfo
  media: advertise new-style codec aliases
 2019-02-07 06:15:27 +00:00
Soonil Nagarkar
4cd7ad7e54 Merge "Minor cleanups to LMS" 2019-02-07 05:19:50 +00:00
TreeHugger Robot
2b92401717 Merge "Remove the IncidentHeaderProto dependency from statsd." 2019-02-07 04:16:40 +00:00
Remi NGUYEN VAN
d7fb7d59a1 Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 5cdb4c3451 am: e7408d4f3e 
am: 9b03bba687

Change-Id: I0a52fc46a22d21147ab7d1594fd79182b5f23eb7
 2019-02-06 20:10:28 -08:00
Remi NGUYEN VAN
9b03bba687 Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 5cdb4c3451 
am: e7408d4f3e

Change-Id: I5684b4fdc0e1030d372287d53f22b66fe8d90420
 2019-02-06 19:58:59 -08:00
Remi NGUYEN VAN
e7408d4f3e Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" 
am: 5cdb4c3451

Change-Id: I5bc7a8dae5667a1509f9741be571008a919b6461
 2019-02-06 19:50:15 -08:00
Remi NGUYEN VAN
5cdb4c3451 Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" 2019-02-07 03:33:54 +00:00
Kevin Rocard
a3b457d90d Merge "Audio Policy: Allow to use DAP RENDER|LOOPBACK" 2019-02-07 03:10:10 +00:00
Remi NGUYEN VAN
2c6e0c6b5a Merge "Add API for NetworkStack to start captive portal" am: ca551ce981 am: 7f71f50ae6 
am: b6a6843c31

Change-Id: I54a32dd01f1f697fc7da703bc1d258ed6a43df23
 2019-02-06 19:08:29 -08:00