Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
447,608 Commits 3 Branches 0 Tags
004e85f798dc88265edffebeba66da4efaeb2735
Commit Graph

447608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruslan Tkhakokhov
004e85f798 Route EncryptedLocalTransport KV backup/restore through encryption code 
Bug: 142227548
Test: Verify the device boots successfully
      Verify EncryptedLocalTransport APK is present
      Verify manual backup/restore using bmgr for LocalTransport and EncryptedLocalTransport
      For LocalTransport (unencrypted) and EncryptedLocalTransport:
        atest CtsBackupTestCases
        atest CtsBackupHostTestCases
        atest GtsBackupTestCases
        atest GtsBackupHostTestCases


Change-Id: Iac3a8a50d7f761442a4b784cfba3a980e900dd7f
 2019-10-16 08:58:01 +00:00
TreeHugger Robot
d0844929a3 Merge "Add the Android B&R team as owners of backup code" 2019-10-16 08:22:03 +00:00
Kevin Chang
4e4488f868 Merge "Add metrics constants for dialog of magnification" 2019-10-16 08:12:47 +00:00
Tyler Gunn
9f2efe987e Merge "Add ITelephony setCepEnabled command line command." am: ae48da3c55 am: ec6047ad09 am: b4dfa6e2fb 
am: f23f696991

Change-Id: Id1a82749d4224cf8ee479c1a42ab8967fbdffa0c
 2019-10-15 23:59:37 -07:00
Tyler Gunn
f23f696991 Merge "Add ITelephony setCepEnabled command line command." am: ae48da3c55 am: ec6047ad09 
am: b4dfa6e2fb

Change-Id: I0924d71b202109bad8e43a7c5160b05ac6c5f238
 2019-10-15 23:53:26 -07:00
Tyler Gunn
b4dfa6e2fb Merge "Add ITelephony setCepEnabled command line command." am: ae48da3c55 
am: ec6047ad09

Change-Id: I1bf8d42a2e7874ceb6503f50fb873e59fefdf713
 2019-10-15 23:41:21 -07:00
Al Sutton
28cb481a09 Add the Android B&R team as owners of backup code 
This will ensure that the Android B&R team can help make any new
settings backups effective and in-line with best practices.

Test: Commit a file post merging to ensure checks are enforced.
Change-Id: I504f5e3793062c6542bc65b65b50dba694a8e62f
 2019-10-16 06:39:54 +00:00
TreeHugger Robot
265a8adcbf Merge "Move dimens from overlay to framework" 2019-10-16 06:36:34 +00:00
TreeHugger Robot
d489d7f6da Merge changes Ic0304c29,I7fdb41aa 
* changes:
  Add trace based window manager perf test
  Rename StubActivity to PerfTestActivity
 2019-10-16 06:30:29 +00:00
Tyler Gunn
ec6047ad09 Merge "Add ITelephony setCepEnabled command line command." 
am: ae48da3c55

Change-Id: Ib532a5c16c29596131a6fbeb695fc2a7d59dd81b
 2019-10-15 23:29:29 -07:00
TreeHugger Robot
6bc75fcbce Merge changes from topic "reportFullyDrawn" 
* changes:
  startop: Add reportFullyDrawn event support in Iorap.
  startop: Add timestamps for IntentStarted and ActivityLaunchFinished.
  startop: Add reportFullyDrawn event support in framework.
 2019-10-16 06:15:26 +00:00
Treehugger Robot
ae48da3c55 Merge "Add ITelephony setCepEnabled command line command." 2019-10-16 06:13:47 +00:00
TreeHugger Robot
acb8ee8122 Merge "Normalize null argument behavior for GNSS APIs" 2019-10-16 06:08:08 +00:00
TreeHugger Robot
eb64817aad Merge changes I2915cdc9,Ide6ba9d8 
* changes:
  Remove name from InputMonitor
  Simplify creation of NativeInputChannel
 2019-10-16 06:02:56 +00:00
Nick Desaulniers
32be5c8073 Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" am: f7cf0dfa55 am: 0b6b756f3d am: d171f486f6 
am: 580763aabe

Change-Id: I3b062d044ef7a88498edeaf5c1fcd0f3387d2943
 2019-10-15 22:21:44 -07:00
TreeHugger Robot
d9294a0a43 Merge "unhide getConsolidatedNotificationPolicy" 2019-10-16 05:10:10 +00:00
Lucas Lin
f13d2b8c53 Merge "Remove the network capabilities which are added twice" am: 931234b451 am: 4c90111d11 am: eb9542bdd7 
am: 69de214290

Change-Id: I4868e49b461a0e1990827acdcdd29279b988bd34
 2019-10-15 22:09:26 -07:00
TreeHugger Robot
80e1efd80b Merge "Allow looping ringtones to play uninterrupted" 2019-10-16 05:05:46 +00:00
Nick Desaulniers
580763aabe Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" am: f7cf0dfa55 am: 0b6b756f3d 
am: d171f486f6

Change-Id: I64ee854c7efaabe03f7ce65778041023bf4457e2
 2019-10-15 21:58:45 -07:00
Lucas Lin
69de214290 Merge "Remove the network capabilities which are added twice" am: 931234b451 am: 4c90111d11 
am: eb9542bdd7

Change-Id: Ifea6d9380bfbfeb3ca5a35874c51fd1f5fdef6b0
 2019-10-15 21:52:23 -07:00
Nick Desaulniers
d171f486f6 Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" am: f7cf0dfa55 
am: 0b6b756f3d

Change-Id: I2f28cd59087aff7726c1dab79ceaeb15e5edd6c9
 2019-10-15 21:48:15 -07:00
Lucas Lin
eb9542bdd7 Merge "Remove the network capabilities which are added twice" am: 931234b451 
am: 4c90111d11

Change-Id: Iad8268118899d21bf665d64b61e1cb1c4f49ca7e
 2019-10-15 21:41:47 -07:00
Nick Desaulniers
0b6b756f3d Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" 
am: f7cf0dfa55

Change-Id: I8e7398797b53eab6efdebf7b5e83f6573ee5f83c
 2019-10-15 21:30:43 -07:00
Lucas Lin
4c90111d11 Merge "Remove the network capabilities which are added twice" 
am: 931234b451

Change-Id: I884dd7720ef9ccf257dc49de11a24918c00fa0ca
 2019-10-15 21:23:48 -07:00
Saki Oomori
02fca08ccc Add new carrier config to extend DisconnectCause to play busy tone 
am: 63bb856162

Change-Id: I80224cbf453b156676458538cd0bc5c05be4a296
 2019-10-15 21:23:30 -07:00
Treehugger Robot
f7cf0dfa55 Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" 2019-10-16 03:48:23 +00:00
TreeHugger Robot
8c2efe4114 Merge "Remove CredentialHash serialization" 2019-10-16 03:45:40 +00:00
TreeHugger Robot
89b6124386 Merge "Fix typo 'rotue' to 'route'" 2019-10-16 03:33:36 +00:00
Lucas Lin
931234b451 Merge "Remove the network capabilities which are added twice" 2019-10-16 03:17:48 +00:00
Amy Zhang
1e94d6db47 Merge "cec: switching to arc port one time at least when resume [1/2]" 2019-10-16 02:15:46 +00:00
TreeHugger Robot
21a2e2d79c Merge "Deprecate unused metrics" 2019-10-16 02:01:25 +00:00
Saki Oomori
63bb856162 Add new carrier config to extend DisconnectCause to play busy tone 
This carrier config is used to specify additional DisconnectCause for
playing busy tone.

Bug: 116189822
Test: manual - Checked that busy tone is played according to
"KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY".
Change-Id: I58afb08ddc718bfb23d6c8b4f248c4c05d084829
 2019-10-15 18:43:01 -07:00
Hyundo Moon
dd0a725758 Fix typo 'rotue' to 'route' 
Test: Builds successfully
Change-Id: I97a45701e5777e896b31fd3a854973526e66c383
 2019-10-16 10:41:22 +09:00
TreeHugger Robot
e84f360457 Merge "Few minor codegen fixes" 2019-10-16 01:37:43 +00:00
TreeHugger Robot
453033f64d Merge "Use different reorder modes for fail safe before and after Overview" 2019-10-16 01:30:38 +00:00
TreeHugger Robot
6a2f935e36 Merge "Use HdmiProperties for ro.hdmi.set_menu_language" 2019-10-16 01:07:08 +00:00
Hall Liu
3f4dde8054 [automerger skipped] Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" am: 15ddba32e0 am: 510f917b94 am: 27b61580fe -s ours 
am: 58e805cc00

Change-Id: I09e2d72d46a54b03083b17c30709065ecbccfff5
 2019-10-15 18:00:15 -07:00
Jinping Wang
88a819f9aa cec: switching to arc port one time at least when resume [1/2] 
BUG=136978624
Test: manual

Problem:
when Atom stay at ARC inpt before standby, it maybe not switch to
ArcInputService one time, it will lead to no sound

Solution:
switching to arc port one time at least when resume and cec messages
coming

Verify:
test ok using atom

Change-Id: I236ae9c36b12ffc2bed6aa8400bdadc3c0fc01ae
Signed-off-by: Jinping Wang <jinping.wang@amlogic.com>
(cherry picked from commit 17e4dbf4b0cf994eafa76a8ea5a702da368b7b97)
 2019-10-16 00:48:44 +00:00
Hall Liu
58e805cc00 [automerger skipped] Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" am: 15ddba32e0 am: 510f917b94 
am: 27b61580fe -s ours
am skip reason: SHA1 27b61580fe skipped by user hallliu

Change-Id: I2646ee95ddc238bb3f008f7e02ff0e6f18230dc9
 2019-10-15 17:47:20 -07:00
Lucas Dupin
a45a6e4ae4 Merge "Better line breaks on the keyguard" 2019-10-16 00:31:59 +00:00
Lucas Dupin
ea5fed1ae8 Merge "Fade out display when prox or presence" 2019-10-16 00:31:37 +00:00
Siarhei Vishniakou
7480ae28e4 Remove name from InputMonitor 
InputMonitor already contains an inputchannel. And inputchannel has a
name. Using the latest codegen tool, toString would already properly
print name because InputChannel has toString. So we don't need to
duplicate this field in InputMonitor.

Bug: 142581626
Test: presubmit
Change-Id: I2915cdc9928ab50991539593e584173e2231c16f
 2019-10-15 17:27:21 -07:00
Siarhei Vishniakou
047790a493 Simplify creation of NativeInputChannel 
We don't need to create an object just to pass it to the function.
The target function can do it by itself.
This change will enable opening up
android_view_InputChannel_createInputChannel to the
com_android.._InputManagerService, which will allow the InputManager to
create InputChannel objects.

Bug: 142581626
Test: presubmit
Change-Id: Ide6ba9d88b209f33a0161c61cc49f4e02b8ed486
 2019-10-15 17:27:21 -07:00
Hall Liu
27b61580fe Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" am: 15ddba32e0 
am: 510f917b94

Change-Id: I75b891ec471515d8472c79164486eaeb51ae6119
 2019-10-15 17:22:23 -07:00
Hall Liu
510f917b94 Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" 
am: 15ddba32e0

Change-Id: Iaf41586e1eb679a003ba4fc52c4413617c71e7a7
 2019-10-15 17:08:32 -07:00
Jian-Yang Liu
97fffca629 Merge "Changed car status bar to show or hide by setting layout height instead of removing/adding the view." into qt-qpr1-dev am: e6e2319970 
am: b1ceaefe77

Change-Id: I1b39321452a8d74885220a5efa14e3f7e5c70e07
 2019-10-15 16:46:28 -07:00
Hall Liu
15ddba32e0 Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" 
* changes:
  Add new carrier config to extend DisconnectCause to play busy tone
  add certs to carrier configs and store them as UiccAccessRules
 2019-10-15 23:46:17 +00:00
Jian-Yang Liu
b1ceaefe77 Merge "Changed car status bar to show or hide by setting layout height instead of removing/adding the view." into qt-qpr1-dev 
am: e6e2319970

Change-Id: I38aafe8fbcf39350c34482d977f48385aa0c2d33
 2019-10-15 16:39:58 -07:00
Jian-Yang Liu
e6e2319970 Merge "Changed car status bar to show or hide by setting layout height instead of removing/adding the view." into qt-qpr1-dev 2019-10-15 23:20:59 +00:00
Nick Chalko
bfb3076856 Use HdmiProperties for ro.hdmi.set_menu_language 
Test: m services.core
Change-Id: Ifd93fb21985f13e341798a3c0da786664dcbcc00
 2019-10-15 16:19:12 -07:00