Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
360,111 Commits 3 Branches 0 Tags
c73f954cc7e2b6c0305624faee8fa4c3003ffd29
Commit Graph

80015 Commits

Author SHA1 Message Date
TreeHugger Robot
c73f954cc7 Merge "Revert "Add the assisted dialing carrier config."" 2018-02-26 16:02:34 +00:00
TreeHugger Robot
a620aa1a13 Merge "Remove account param from generateKey method" 2018-02-26 15:16:18 +00:00
TreeHugger Robot
c44d5053f2 Merge "Remove account from WrappedApplicationKey" 2018-02-26 14:52:19 +00:00
Robert Berry
8230c8e0d4 Add test for KeyChainSnapshot Parcelable 
Bug: 73811828
Test: runtest frameworks-core -p android.security.keystore.recovery
Change-Id: I9448ff791f4f8b82621df2d4343febdce86dbf42
 2018-02-26 11:17:55 +00:00
Robert Berry
291bd32c9e Remove account from WrappedApplicationKey 
Recovery controller will no longer be aware of accounts. It is up to
the recovery agent to decide where to upload keys, and if so what
accounts to use.

Bug: 73811828
Test: runtest frameworks-core -p android.security.keystore.recovery
Change-Id: I929076d948f4d36ba88b68cca08058a5cdde0107
 2018-02-25 23:11:17 +00:00
Robert Berry
a3b994798d Remove account param from generateKey method 
Bug: 73811828
Test: runtest frameworks-services -p
      com.android.server.locksettings.recoverablekeystore
Change-Id: If2f4174beea9cfb8c852139a7594815c377dbe7a
 2018-02-25 14:48:42 +00:00
Robert Berry
f34ad9509d Merge "Remove packageName from getRecoveryStatus" 2018-02-25 14:08:47 +00:00
TreeHugger Robot
d0f517b9df Merge "Revert "Block adb from changing certain settings value when corresponding user"" 2018-02-24 22:13:53 +00:00
Hugo Benichi
dcf008a071 Merge "Fix NPE in NetworkMetrics" am: cb0714332d am: 34d08160bd 
am: ca13c0553a

Change-Id: I66e07968b013c941706d4c772684fa8851e0ccf3
 2018-02-24 19:30:40 +00:00
Hugo Benichi
ca13c0553a Merge "Fix NPE in NetworkMetrics" am: cb0714332d 
am: 34d08160bd

Change-Id: I5c182e9cba857d291ea16fb8bd6b0a66d11cf432
 2018-02-24 19:21:43 +00:00
Hugo Benichi
34d08160bd Merge "Fix NPE in NetworkMetrics" 
am: cb0714332d

Change-Id: Icd844e6f04d93e9092b7fbf109ece537dfff4116
 2018-02-24 19:13:03 +00:00
Hugo Benichi
cb0714332d Merge "Fix NPE in NetworkMetrics" 2018-02-24 17:54:01 +00:00
Yueming Wang
348bf6254f Revert "Block adb from changing certain settings value when corresponding user" 
This reverts commit 4140f6c4e3.

Reason for revert: This CL is merged accidentally as it got merged together with another CL.  

Change-Id: I043a5872f370775a4261a1ca7ccb00489a588303
 2018-02-24 12:52:18 +00:00
TreeHugger Robot
cc25afe000 Merge "Flip order of arguments" 2018-02-24 10:25:40 +00:00
TreeHugger Robot
8a36da32a1 Merge "Add CertPath to KeyChainSnapshot and startRecoverySession" 2018-02-24 10:19:21 +00:00
tiansiming [田思明]
30bfbfa3e3 Merge "Let sendShowMessage called from hide to show" am: e7d04d728c am: f91fddddd1 
am: ef2ac4066b

Change-Id: Ic2dc363d4a26b9c3a10e0b7d1072765501eec383
 2018-02-24 03:04:26 +00:00
tiansiming [田思明]
ef2ac4066b Merge "Let sendShowMessage called from hide to show" am: e7d04d728c 
am: f91fddddd1

Change-Id: I8aa277a5448b999496b79f6b5721738d3b5f9af7
 2018-02-24 02:56:15 +00:00
tiansiming [田思明]
f91fddddd1 Merge "Let sendShowMessage called from hide to show" 
am: e7d04d728c

Change-Id: If406d79d0489a9c61322c0937fce2c9a9a5c4dc1
 2018-02-24 02:43:03 +00:00
TreeHugger Robot
3016f335f0 Merge "Store carrier app name in global settings for SIM dialog/notification" 2018-02-24 02:38:26 +00:00
TreeHugger Robot
284786b9f6 Merge "Fix sleep time in Cellular" 2018-02-24 02:37:38 +00:00
TreeHugger Robot
4e056c8bfa Merge "Explicitly do not support SEARCH_SERVICE on UI_MODE_TYPE_WATCH" 2018-02-24 02:13:27 +00:00
Ruchi Kandoi
99dac40437 Merge "Wrap raw binder interface into public classes" am: a4bde27012 am: 3cd878df0f 
am: 21b4edb3cd

Change-Id: I9797e593a44b86f32f6c8c343d8bb15076e6ca87
 2018-02-24 02:12:34 +00:00
Ruchi Kandoi
21b4edb3cd Merge "Wrap raw binder interface into public classes" am: a4bde27012 
am: 3cd878df0f

Change-Id: I896528596006eb76241e706bb71d958214fb6499
 2018-02-24 02:04:37 +00:00
Ruchi Kandoi
3cd878df0f Merge "Wrap raw binder interface into public classes" 
am: a4bde27012

Change-Id: Idd3b7a5563b2432654af1a331a6f040c1e98832a
 2018-02-24 01:51:26 +00:00
Treehugger Robot
e7d04d728c Merge "Let sendShowMessage called from hide to show" 2018-02-24 01:27:13 +00:00
TreeHugger Robot
8ae9a37bbc Merge "Implement issue #73301635: Ability to extract device configuration" 2018-02-24 01:21:34 +00:00
Bo Zhu
7c1972ff71 Add CertPath to KeyChainSnapshot and startRecoverySession 
CertPath will include a cert of the trusted hardware and necessary
intermediate certificates.

Bug: 73784851
Change-Id: Ic70616b8f119891a82402b91035456e404c5f6de
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
 2018-02-23 16:44:41 -08:00
TreeHugger Robot
b9cacbea94 Merge "Improve reporting of bucketing reason" 2018-02-24 00:24:03 +00:00
Treehugger Robot
a4bde27012 Merge "Wrap raw binder interface into public classes" 2018-02-24 00:19:29 +00:00
Erik Wolsheimer
ac5cecd85d Explicitly do not support SEARCH_SERVICE on UI_MODE_TYPE_WATCH 
Bug: 69950606
Change-Id: Ia195e88d8652cd7875d0ce03875034698367001c
(cherry picked from commit 980ba14b921932e85cdc0447af0398778a1c0d64)
 2018-02-23 23:45:18 +00:00
Dianne Hackborn
bf5ba6bbcc Implement issue #73301635: Ability to extract device configuration 
am get-config can now return its information as a protobuf,
so that we have a nice machine readable representation of the
configuration available.  This is available through the new
"--proto" option.

Also add a new "--device" option which will include additional
device configuration information in the output.

Defined the protos to contain all of this information.  Updated
Configuration to generate everything it should in the proto.

The output has been changed so that configuration history
will not be returned unless you specify the --days option.

Bug: 73301635
Test: Booted, ran, output

Change-Id: I074b92b45d6b1da1c1a499080db9e006d12b9fea
 2018-02-23 15:30:04 -08:00
Kurt Nelson
72534b7e22 Flip order of arguments 
Callbacks as the second parameter is more Kotlin friendly.

Bug: 73751206
Test: cts-tradefed run commandAndExit cts-dev --module CtsOsTestCases --test android.os.cts.StrictModeTest
Change-Id: Ib9c9469be1b81dc65e74c9e303f474c54a43b18b
 2018-02-23 15:12:59 -08:00
Hugo Benichi
e73486bf24 Fix NPE in NetworkMetrics 
addTcpStatsResult() in NetworkMetrics was not checking for the nullness
of the pendingSummary object and trying to add stats regardless.

This patch fixes addTcpStatsResult() so that it populates pendingSummary
if necessary, similarly to addConnectResult() and addDnsResult()

Bug: 73825228
Test: runtest frameworks-net
Change-Id: I616a4be0e6e5920bd2f5c58292fea769bd516df7
 2018-02-24 08:01:30 +09:00
TreeHugger Robot
aa360efee0 Merge changes from topic "wipedata" 
* changes:
  Rename WipeDataWithReason API to wipeData.
  Block adb from changing certain settings value when corresponding user restriction is on.
 2018-02-23 22:54:44 +00:00
TreeHugger Robot
3e946e9309 Merge "Add timestamp for events pulled by companision service." 2018-02-23 22:33:21 +00:00
goneil
15f5a7ef45 Store carrier app name in global settings for SIM dialog/notification 
Bug: 70042722
Test: Manual QA
Change-Id: If3e97e90a37ac4e585a64c21ddfe234259cd0813
 2018-02-23 13:47:44 -08:00
TreeHugger Robot
4d8ea3793f Merge "Guard against updateDoze after detach" 2018-02-23 21:41:49 +00:00
TreeHugger Robot
1dcd645789 Merge "Use PooledLambda in print code" 2018-02-23 21:21:20 +00:00
Gil O'Neil
183a553273 Merge "Allow certificates to be stored in the carrier app whitelist" 2018-02-23 21:18:40 +00:00
Zhi An Ng
c9b2722cb8 Merge "Revert "Revert "Log the apk optimization state in the MetricsLogger""" 2018-02-23 21:15:32 +00:00
TreeHugger Robot
f46aade7d8 Merge "Make mapIntentToUri understand meta-data hookup" 2018-02-23 20:25:56 +00:00
Eugene Susla
9f35ca9964 Use PooledLambda in print code 
This replaces the usage of handler message types with PooledLambda

Test: atest CtsPrintTestCases
Change-Id: I19b01278b67b5fe18d48a2e0bb8300bbe1413a63
 2018-02-23 11:09:29 -08:00
Yangster-mac
c552b35316 Add timestamp for events pulled by companision service. 
Test: statsd cts test
Change-Id: I2658dba747ff93a120c50b5294f696918588e9fe
 2018-02-23 10:56:03 -08:00
TreeHugger Robot
e406ac080f Merge "camera: Add OisSamples synthetic key" 2018-02-23 18:47:56 +00:00
Amith Yamasani
119be9a5fc Improve reporting of bucketing reason 
Keep track of main and sub reason for bucket change

Bug: 73178753
Test: atest AppIdleHistoryTests
Change-Id: I4936281ac06046bb5ffed9f3306efa24c7fd47ab
 2018-02-23 10:45:39 -08:00
TreeHugger Robot
6dcc9de2fe Merge "New APIs to let app developers manage autofill semantics when reusing views." 2018-02-23 18:26:36 +00:00
Erik Wolsheimer
5fb1070b1f Guard against updateDoze after detach 
Bug: 68815183
Change-Id: I147f04af4ea1af59f95757a14de3c34021e048a5
 2018-02-23 17:57:30 +00:00
TreeHugger Robot
fb83c73f37 Merge "STOPSHIP: Roll forward: Add UidCpuPower global setting" 2018-02-23 17:49:17 +00:00
TreeHugger Robot
ed24f903ea Merge "Revert "Add "Unlocked device required" parameter to keys"" 2018-02-23 17:42:45 +00:00
Christine Franks
5649922b7c Merge "Support forced Night Display auto mode" 2018-02-23 17:39:21 +00:00