Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
371,475 Commits 3 Branches 0 Tags
db191a949dbb6b2bcdfdbcf9784d03edb479cd5e
Commit Graph

91152 Commits

Author SHA1 Message Date
Benjamin Miller
c31df2070f Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev am: 5037beea1c 
am: c886324aa2

Change-Id: I70b35af7ae3e82a83bb17ec7962f4a007ff8428f
 2018-04-17 04:19:55 -07:00
Benjamin Miller
c886324aa2 Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev 
am: 5037beea1c

Change-Id: I36650a1acc5e6eaf9c192f12927425c253bb0b6d
 2018-04-17 04:06:20 -07:00
Dan Gittik
e654ca92f4 Merge "Fixed power manager CTS test." into pi-dev am: 15d35c1274 
am: 17ad53b40b

Change-Id: Ib805670acfae2c9b17afb07e6484906fae71f5ce
 2018-04-17 04:02:45 -07:00
TreeHugger Robot
5037beea1c Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev 2018-04-17 10:53:36 +00:00
Dan Gittik
17ad53b40b Merge "Fixed power manager CTS test." into pi-dev 
am: 15d35c1274

Change-Id: I375d0d77520a707cc76064a93def15faa5f8ddb1
 2018-04-17 03:50:58 -07:00
TreeHugger Robot
15d35c1274 Merge "Fixed power manager CTS test." into pi-dev 2018-04-17 10:39:30 +00:00
Stanley Tng
100d5ab5d4 Merge "Clarify API doc for BluetoothGattServer::addService" am: f493c66f39 am: 478b35a2fd 
am: 5e66525dd0

Change-Id: If97b69d10aaec57e775ae172bcde055abbe8c7b8
 2018-04-16 20:18:12 -07:00
Stanley Tng
eebda160ec Merge "Cleanup documentation for LE CoC in BluetoothAdapter" am: 7b25698549 am: e93a622275 
am: 87f82bc6dd

Change-Id: Ie524f355e9f664133045258ae2216282c86db53b
 2018-04-16 20:09:03 -07:00
Stanley Tng
5e66525dd0 Merge "Clarify API doc for BluetoothGattServer::addService" am: f493c66f39 
am: 478b35a2fd

Change-Id: Ia1d0ea90ceff6c0e39062de5e4cc000d76d51f7a
 2018-04-16 20:08:18 -07:00
Stanley Tng
478b35a2fd Merge "Clarify API doc for BluetoothGattServer::addService" 
am: f493c66f39

Change-Id: If988cc85292426c6694732e2158ad698d740c93d
 2018-04-16 19:59:17 -07:00
Makoto Onuki
e94874eed0 Merge "Add 1-day sync stats in syncmanager dumpsys." into pi-dev am: d7732b4c8a 
am: 38f0cb4961

Change-Id: If710e543654f26213ff1143ca8e3335160e7371a
 2018-04-16 19:16:56 -07:00
Stanley Tng
87f82bc6dd Merge "Cleanup documentation for LE CoC in BluetoothAdapter" am: 7b25698549 
am: e93a622275

Change-Id: Ia23d8a96128420576d8b6ff5eae0075825df8c2f
 2018-04-16 19:08:53 -07:00
Stanley Tng
e93a622275 Merge "Cleanup documentation for LE CoC in BluetoothAdapter" 
am: 7b25698549

Change-Id: I5e7633c73c7ed7f9257acb4fb891fbaec8202f63
 2018-04-16 18:58:21 -07:00
Jeff Sharkey
00f8ad0a11 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev am: 936c0868f8 
am: 7b913d70b9

Change-Id: Ifd131fb60996e416f44f7acc68257e4663ef4ba7
 2018-04-16 18:43:09 -07:00
Makoto Onuki
38f0cb4961 Merge "Add 1-day sync stats in syncmanager dumpsys." into pi-dev 
am: d7732b4c8a

Change-Id: I7eeab220ca2d90623868e1e3f724961ad660da42
 2018-04-16 18:30:38 -07:00
Hidenari Koshimae
89a6da9211 Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev am: 8be1197c5d 
am: 3995b3ff9c

Change-Id: I66a8d3f31cdaa0a96a4eb991f1f6ab7fb2e8a32c
 2018-04-16 17:46:43 -07:00
Jeff Sharkey
7b913d70b9 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev 
am: 936c0868f8

Change-Id: I3c84c646b3a79f09dc1210e18f48d1f87d38abd4
 2018-04-16 17:44:58 -07:00
Makoto Onuki
d7732b4c8a Merge "Add 1-day sync stats in syncmanager dumpsys." into pi-dev 2018-04-17 00:11:25 +00:00
Treehugger Robot
f493c66f39 Merge "Clarify API doc for BluetoothGattServer::addService" 2018-04-17 00:07:38 +00:00
Jeff Sharkey
936c0868f8 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev 2018-04-17 00:04:53 +00:00
Hidenari Koshimae
3995b3ff9c Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev 
am: 8be1197c5d

Change-Id: I41dc263a13f67e7d4772343b1c10f52383786bd2
 2018-04-16 17:02:46 -07:00
David Chen
3718e716e6 Merge "Adds a code when statsd sends intent to getData." into pi-dev am: 17d2de09cb 
am: 5cc0e05e03

Change-Id: I54b0067c7aa127e5fedbb60d98bb7035bef62ae5
 2018-04-16 16:45:59 -07:00
Dan Cashman
d5ad6a4f8d Merge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev am: 82f36b120d 
am: cc369093f6

Change-Id: I1c2e82b513035872f831d2fd55063e451a383439
 2018-04-16 16:27:19 -07:00
TreeHugger Robot
8be1197c5d Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev 2018-04-16 23:25:39 +00:00
David Chen
5cc0e05e03 Merge "Adds a code when statsd sends intent to getData." into pi-dev 
am: 17d2de09cb

Change-Id: I4f429329603d7dfe512de6802d4f083d230fc4d1
 2018-04-16 16:21:23 -07:00
Dmitry Dementyev
51806c9862 Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev am: 5291268754 
am: 88a9786359

Change-Id: I6ba172a7f56904ba603ed816d1a32f3357d4563f
 2018-04-16 16:12:43 -07:00
Dan Cashman
cc369093f6 Merge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev 
am: 82f36b120d

Change-Id: I6a0b86e427ecb1e889cb39bae1b3e99248daea16
 2018-04-16 16:04:34 -07:00
Dmitry Dementyev
88a9786359 Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev 
am: 5291268754

Change-Id: Ic390d4b001ec63db78e5f8effc59a1c445153c6a
 2018-04-16 15:50:16 -07:00
TreeHugger Robot
17d2de09cb Merge "Adds a code when statsd sends intent to getData." into pi-dev 2018-04-16 22:46:03 +00:00
TreeHugger Robot
82f36b120d Merge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev 2018-04-16 22:40:56 +00:00
Stanley Tng
dac8e14018 Cleanup documentation for LE CoC in BluetoothAdapter 
Test: Compile
Bug: 77631591
Change-Id: Ic3c7f13e560534a048bf5c8b274fe62190c214c7
 2018-04-16 22:33:31 +00:00
TreeHugger Robot
5291268754 Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev 2018-04-16 22:14:22 +00:00
Dan Cashman
e942b914a4 Replace PackageInfo#signingCertificateHistory field doc reference. 
During API review, PackageInfo#signingCertificateHistory was changed
to PackageInfo#signingInfo.  This was not reflected everywhere in
the documentation.  Update it.

Bug: 74831530
Test: Doc change only, builds.
Change-Id: I497cdd732dffacf376ac05f7ccd181004c947210
 2018-04-16 14:44:13 -07:00
Stanley Tng
4b5cf48560 Clarify API doc for BluetoothGattServer::addService 
Clarify that the caller has to wait for onServiceAdded callback before
calling BluetoothGattServer::addService again.

Bug: 72717069
Test: Compile
Change-Id: I20b031c724ba64bfd71cf10e58e587f69e4a2555
 2018-04-16 13:12:52 -07:00
Hall Liu
5f0cbc215d Merge "Move RTT system setting to Settings.Secure" 
am: 9a51f07117

Change-Id: I226e9a91725f7755595c3530162829f8bf61b135
 2018-04-16 13:08:16 -07:00
Caxton Chan
6f9ffd3b74 Merge "Enable feature flag for audio output switcher." into pi-dev am: 116e05cbba 
am: fc01e133b5

Change-Id: I512891cb258131cd1b6174e60936f707f6a875a6
 2018-04-16 12:50:14 -07:00
Caxton Chan
fc01e133b5 Merge "Enable feature flag for audio output switcher." into pi-dev 
am: 116e05cbba

Change-Id: Id7144fbbf59ca9efeee0f20aa1a988377c87747a
 2018-04-16 12:35:04 -07:00
Caxton Chan
116e05cbba Merge "Enable feature flag for audio output switcher." into pi-dev 2018-04-16 19:24:31 +00:00
Makoto Onuki
9498621f41 Add 1-day sync stats in syncmanager dumpsys. 
The stats currently shown in sync manager dumpsys is the total *since wipe* so
they're usually pretty much useless.

So let's add "today" and "yesterday" stats too.

- Also add "# failures" and "# cancels".
- Also split up SERVER to OTHER and FEED (i.e. subscribedfeeds).

Bug: 76035392
Test: Boot, run some sync, then do "cmd content reset-today-stats"
- Also tested with actually setting the clock to 23:59 and wait
- Check the result with "dumpsys content".

Sample output:
=======================================================================
Authority                                           Syncable  Enabled  Stats  Loc  Poll  Per  Feed  User  Othr  Tot  Fail  Can  Time  Last Sync            Backoff
------------------------------------------------------------------------------------------------------------------------------------------------------------------
com.android.calendar                                1         true     Total  0    0     0    1     0     7     8    0     2    8s    FEED SUCCESS
                                                                       Today                  1           5     6               7s    2018-04-12 15:21:24
                                                                       Yestr                                                    0s
com.android.chrome                                  0         false    Total  0    0     0    0     0     0     0    0     0    0s
                                                                       Today                                                    0s

Change-Id: Id0ea42435a9f759e47d4b9490292759270f8e9a5
 2018-04-16 12:23:26 -07:00
Hidenari Koshimae
3a385f81a3 Camera: Fix a description for MONOCHROME camera capability 
Test: Compile
Bug: 77902724
Change-Id: Ibb6a1d4b5f80a0c4d0e3f29625b03a827a3ed80c
 2018-04-16 12:22:34 -07:00
Ricky Wai
2604d6ef05 Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev am: ed2a3cadc1 
am: 8798ae731c

Change-Id: I0136e13cab068ee93aab0820061adaef28bbc362
 2018-04-16 12:07:05 -07:00
Ricky Wai
8798ae731c Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev 
am: ed2a3cadc1

Change-Id: Icb8d0962ddbe4ba4c25b835cc631cedd94c818eb
 2018-04-16 11:50:44 -07:00
Jeff Sharkey
6b64925737 Protect usage data with OP_GET_USAGE_STATS. 
APIs that return package usage data (such as the new StatsManager)
must ensure that callers hold both the PACKAGE_USAGE_STATS permission
and the OP_GET_USAGE_STATS app-op.

Add noteOp() method that can be called from native code.

Also add missing security checks on command interface.

Bug: 77662908, 78121728
Test: builds, boots
Change-Id: Ie0d51e4baaacd9d7d36ba0c587ec91a870b9df17
 2018-04-16 12:44:32 -06:00
Hall Liu
9a51f07117 Merge "Move RTT system setting to Settings.Secure" 2018-04-16 18:40:28 +00:00
Ricky Wai
ed2a3cadc1 Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev 2018-04-16 18:19:00 +00:00
Bryce Lee
b35cfd79ab Merge "Remove temporary logging." into pi-dev am: 216b50ad97 
am: 1f6cebfab1

Change-Id: I05f5b91406ad73aa8140bf36b1c2381667adcc88
 2018-04-16 11:18:10 -07:00
Bryce Lee
1f6cebfab1 Merge "Remove temporary logging." into pi-dev 
am: 216b50ad97

Change-Id: I49b008a4173e0c3fee6a3e3202f5b18c1c991fc9
 2018-04-16 10:54:57 -07:00
Dan Gittik
26b030d829 Fixed power manager CTS test. 
Added an annotation necessary to allow the power manager CTS test to
access the non-public method nap.

Test: adb install -r \
      out/host/linux-x86/cts/android-cts/testcases/CtsOsTestCases.apk
      adb shell am instrument -e class android.os.cts.PowerManagerTest \
      -w android.os.cts/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ida939f074654bef351e2b8fd563c8463431ce9c6
Fixes: 77907164
 2018-04-16 18:50:10 +01:00
Bryce Lee
216b50ad97 Merge "Remove temporary logging." into pi-dev 2018-04-16 17:36:45 +00:00
Jeff Sharkey
ca4ea18363 Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev am: f78b8ce258 
am: 563a57bcf9

Change-Id: I9b5b2fc72188258326cc875457886370cb20e4fd
 2018-04-16 10:31:41 -07:00