summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-01Merge tag 'LA.QSSI.12.0.r1-06800-qssi.0' into sugisawa-mr1HEADsugisawa-mr1alk3pInjection
"LA.QSSI.12.0.r1-06800-qssi.0" Change-Id: Ie7ca2d974b98ce903ff2d7c8c293bd409c63e1b0
2022-04-04Merge e4fb0bddb45d8b667905f71cec14b7a601c1aa57 on remote branchLinux Build Service Account
Change-Id: I0012121b9f57532ccb96f04d98edf5e786647a7f
2022-03-23Snap for 8343869 from 7f7730eaee3bbc96c3aa9032ed5f0dd356505794 to ↵Android Build Coastguard Worker
s-keystone-qcom-release Change-Id: Idb3f32a29fba18e9fc8ee6475523739fa2b94490
2022-02-22Merge SP2A.220305.013Haamed Gheibi
Bug: 220074017 Change-Id: Ia2198b401a3a907c785316e0ef4c00bf27fa59b1
2022-01-22SettingsIntelligence: Style search bar to match new Settings UIsugisawaDanny Lin
- Rounded pill shape - Surface background colors - No shadow - Font size - Height Change-Id: I24d4725f3d759ea633768640995de16f9bdf2c55
2022-01-22SettingsIntelligence: Regen database on build version changeLuca Stefani
Change-Id: I3b1a0af0b4f707316269a0a4ec04a12ca9110348
2022-01-22SettingsIntelligence: Match Settings styleLuca Stefani
* Also fixes dark style Change-Id: I42041fbaf754b149a85f22ac46b84f50830d0504
2022-01-16Merge c2159eaacbfcb7571f5ecb787879b94984c0f1d4 on remote branchLinux Build Service Account
Change-Id: I1a33d508a767e55014375e59eb2245015b3436e3
2021-12-20Snap for 8014993 from c26c879be802139e676c17bcaa138dd68f34c2c4 to ↵Android Build Coastguard Worker
s-keystone-qcom-release Change-Id: I29f7eb443d478385ba8b3d01a556ea0b9cd9af48
2021-12-06Merge mpr-2021-11-05Eric Arseneau
Change-Id: I7bed0e51bb03c532f4c0699d987e3df3b405cc13
2021-11-23Snap for 7938027 from dfbc40fef644301f7487ebc53c4cf9a419611bef to sc-v2-releaseAndroid Build Coastguard Worker
Change-Id: I0e691125baa831b258c239aad577523842e3c776
2021-11-19Add the android.permission.READ_DEVICE_CONFIG permission to avoidStanley Wang
the SecurityException when indexing. Fix: 204961913 Test: manual test and observe the error log Change-Id: I92f8d172e451976980c3cacc2de5597735b83e53
2021-10-08Merge 7db5542de0467325757aefe22c45055eb3e7ffb6 on remote branchLinux Build Service Account
Change-Id: I9fd584f4e7f6f5ba09385ef4458f7122b50aa663
2021-09-21Snap for 7751031 from 0dbec17c6612f925faadebd9388d288569dfa5d5 to ↵Android Build Coastguard Worker
s-keystone-qcom-release Change-Id: I9c2a98093e6fded81e2d99663c8f915d9446b746
2021-09-20[automerger skipped] Merge mpr-2021-09-05 skipped: e51ffc8999Eric Arseneau
Change-Id: I5c36985acf8c908cfc8bfa25ccdb435b4c729f7c
2021-09-16Merge mpr-2021-09-05Eric Arseneau
Change-Id: Idf19e627a03e13138b3d81835ff5e88ddb9adc30
2021-04-18Merge b8ef2c22b6eef1aef03bcd4a4059cc62ac721e9f on remote branchLinux Build Service Account
Change-Id: I2596ec9c254614f0f871091c241129c43a154098
2021-04-06Merge d1e57d2805a668faaff0b5165456f81aa6abb13d on remote branchLinux Build Service Account
Change-Id: Ib86a97c01af4e29528de220067dd7f76aa638199
2021-03-25Snap for 7234866 from 2f8c0c1d4080fc772ed3d32b281560bd2b59955a to ↵Android Build Role Account android-build-prod
s-keystone-qcom-release Change-Id: I950610cc2e62f4270891a4e853e32552b6b169a9
2021-03-25Merge "Merge SP1A.210311.001 Change-Id: ↵Scott Lobdell
Ie1c35d5421dcedbbcdf41341887a652356429c33" into s-keystone-qcom-dev
2021-03-17Snap for 7214042 from 1d5e1b4763dd1f5e8a01d813c871e09d89853c69 to ↵Android Build Role Account android-build-prod
s-keystone-qcom-release Change-Id: I252889536b5eaf310173419f4e2961c3e43e8ace
2021-03-15[automerger skipped] Merge spl-2021-03-05 skipped: b1179309fdEric Arseneau
Change-Id: Ibb271db2c4a9d6070a82c19d03442bb20e29b2bb
2021-03-11Merge SP1A.210311.001Scott Lobdell
Change-Id: Ie1c35d5421dcedbbcdf41341887a652356429c33
2021-03-11Snap for 7199817 from 4dd06ddf172c012b70ccd0fb7058de8ad7a6e678 to ↵Android Build Role Account android-build-prod
s-keystone-qcom-release Change-Id: I74da4fdc9be18bb111cc8f0c6e777a94843dce07
2021-03-09Merge spl-2021-03-05Eric Arseneau
Change-Id: I1e55ccf5446501a7fe14caaece6a6fa45d412801
2021-03-05Snap for 7185571 from 309fb4b1e6d2fa3cf976420da14e82f590347ed3 to sc-v2-releaseandroid-build-team Robot
Change-Id: I1961e5e906d4494747f2d4fc04f74501abb6e4f3
2021-03-05Snap for 7185571 from 309fb4b1e6d2fa3cf976420da14e82f590347ed3 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ic3741c44dc375fd3bcb89bb49652ecdc2f71e7bf
2021-03-05Snap for 7185571 from 309fb4b1e6d2fa3cf976420da14e82f590347ed3 to sc-releaseandroid-build-team Robot
Change-Id: Ib7e1eda4fee426fcf518b8dc0817fd5cb9ca3b82
2021-03-04[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s ours am: ↵Xin Li
da138ba9f6 -s ours am: 7e1dad283a -s ours am skip reason: Change-Id I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc with SHA-1 0cdf233f70 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1613683 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6eaecb972bcf79fcdeb7abf542c82aa70cdcdef3
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s ours am: ↵Xin Li
da138ba9f6 -s ours am skip reason: Change-Id I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc with SHA-1 0cdf233f70 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1613683 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie6cc616a6887d58590055968e6f03f4cf4a22978
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s oursXin Li
am skip reason: Change-Id I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc with SHA-1 0cdf233f70 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1613683 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ac3eea1cf57c8c2b4e10e53dd9fe5af9658165c
2021-03-03Merge RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc Change-Id: Ic82b77269ab5308e6b654b083c4a936058c682d0
2021-02-28Snap for 7175096 from 590bb5c0b93111ac68765bd9b17073d6d6e0691f to sc-v2-releaseandroid-build-team Robot
Change-Id: I57a3fcae8d89ac7bf04e67545d3aa14c4ea70893
2021-02-28Snap for 7175096 from 590bb5c0b93111ac68765bd9b17073d6d6e0691f to sc-releaseandroid-build-team Robot
Change-Id: Id184699aac08dcda164e7da3c94d04f9a16fe11c
2021-02-28Snap for 7175096 from 590bb5c0b93111ac68765bd9b17073d6d6e0691f to sc-d1-releaseandroid-build-team Robot
Change-Id: I2bbb5dda2488252a83fb2bab7e044863ff91a358
2021-02-24Snap for 7166403 from d868265f9fa8c2f7267fca70e54fc13e466af34e to sc-v2-releaseandroid-build-team Robot
Change-Id: I35dc9d5b62dbf7a89413d1136c5bc41100246a66
2021-02-24Snap for 7166403 from d868265f9fa8c2f7267fca70e54fc13e466af34e to sc-releaseandroid-build-team Robot
Change-Id: I125016d118bc526aca31580a0582a6b388dc3654
2021-02-24Snap for 7166403 from d868265f9fa8c2f7267fca70e54fc13e466af34e to sc-d1-releaseandroid-build-team Robot
Change-Id: Icdcce071201d1914bd8510dbeed12aed904254b0
2021-02-23Removing car code from phone SettingsIntelligenceAlex Stetson
AAOS specific code is to be split out into its own package to remove the phone dependencies on car code. Bug: 174688736 Test: manual (app still functions properly on sdk_gphone_x86) Change-Id: I1a7969aef5819ff510e5db5c0716e3a18aa6dc88
2021-02-23Merge SP1A.210222.001Scott Lobdell
Change-Id: Icab5b686bf1399a014b7bf6032f014bd0c4fbb1e
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: 0cdf233f70 -s ours am: ↵Xin Li
dd565d0717 -s ours am skip reason: Change-Id I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c with SHA-1 f075352694 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/13658529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia467db1af13d3c005259d01fc13ca0301f9d972e
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: 0cdf233f70 -s oursXin Li
am skip reason: Change-Id I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c with SHA-1 f075352694 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/13658529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5df14103e6c7cc847120b9d4605b4316d96ea676
2021-02-21Merge ab/7061308 into stage.Xin Li
Bug: 180401296 Merged-In: I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c Change-Id: I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc
2021-02-21Snap for 7160059 from 242f1d1c908233e16caae1edd13c6fa2f865ee72 to sc-releaseandroid-build-team Robot
Change-Id: I67ba3400c3c1058b205609f979df7dc8f338614d
2021-02-21Snap for 7160059 from 242f1d1c908233e16caae1edd13c6fa2f865ee72 to sc-v2-releaseandroid-build-team Robot
Change-Id: Icbfc2b5e0f9d0a9c861d6e84bedc67d95189ee51
2021-02-21Snap for 7160059 from 242f1d1c908233e16caae1edd13c6fa2f865ee72 to sc-d1-releaseandroid-build-team Robot
Change-Id: I787e1279c0b6c177c1509f104f942e706dc76753
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SettingsIntelligence am: ↵Bob Badour
6fdb5be2c2 am: 63261aa2d6 am: 4ced4b4b1f Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1587747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I032ae5f25d57d749acc0194f5e45fa5bf00b50f3
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SettingsIntelligence am: ↵Bob Badour
6fdb5be2c2 am: 63261aa2d6 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1587747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e132f9445bbc80b9f0a6d4b7cc5e1f293f71d40
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SettingsIntelligence am: ↵Bob Badour
6fdb5be2c2 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1587747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I719b99f30e5217810b9b10c93584b1bc9f5b704f
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SettingsIntelligenceBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ief7a4f36a7ea2d9e70f67e57972f6e8b3e133446