Commit Graph

386056 Commits

Author SHA1 Message Date
Treehugger Robot
2944457958 Merge "Fixing checkstyle presubmit hook comments." 2019-06-28 00:09:41 +00:00
Treehugger Robot
2a5ccebc1e Merge "Clarify license terms for Romain Guy's artwork." 2019-06-27 23:47:44 +00:00
Nathan Harold
4d4e2474ea Merge "Revert "Use TM SubId in getDataState and getDataActivity"" 2019-06-27 22:11:18 +00:00
Treehugger Robot
874b481cdf Merge "Stable seek bar positioning" 2019-06-27 22:02:06 +00:00
Bob Badour
20f89c9907 Clarify license terms for Romain Guy's artwork.
As discussed with Romain Guy in the email thread, the Apache 2.0
license applies to the affected .jpg files now and retroactively from
the time of import.

Usage terms updated with exiftool:

$ exiftool -UsageTerms='Apache License Version 2.0' \
    frameworks/base/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    frameworks/base/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy
$ exiftool -UsageTerms='Apache License Version 2.0' \
    frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg
Warning: [minor] Fixed incorrect list type for XMP-xmpRights:UsageTerms - frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg
    1 image files updated
$ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \
    frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg
Usage Terms                     : Apache License Version 2.0
Rights                          : Romain Guy
Creator                         : Romain Guy

Test: doesn't really apply to images

Change-Id: I3b9503efab871600512840531b477d3226432d58
2019-06-27 14:57:44 -07:00
Alex Buynytskyy
3ca39de617 Fixing checkstyle presubmit hook comments.
Test: refactoring CL. Existing unit tests still pass.

Change-Id: I28c9515d124dc7603db91a9082430ffb128111dd
2019-06-27 14:57:09 -07:00
Treehugger Robot
9db70d29a1 Merge "Removing an extra installd call." 2019-06-27 19:23:01 +00:00
Treehugger Robot
e07c0cffe2 Merge "LockAgent: Refactor transformation code" 2019-06-27 19:21:50 +00:00
Chalard Jean
73b4106d7e Merge "Revert "Simplify Exception expressions in CSTest"" 2019-06-27 08:30:57 +00:00
Chalard Jean
f30d1e1685 Revert "Simplify Exception expressions in CSTest"
This reverts commit b92b18b9b9.

Reason for revert: Breaks the build because it removes an unused method that was used by a change intervening in the mean time

Bug: 136143444
Change-Id: Id3a17e0b16ec03276609ca96fb7b582188ed1077
2019-06-27 08:30:05 +00:00
Neil Fuller
d854e6e0b4 Merge "Track change of type from short -> int" 2019-06-27 08:26:31 +00:00
Lorenzo Colitti
bd94f0afd2 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." 2019-06-27 07:53:30 +00:00
Lorenzo Colitti
f2bd2bbfd8 Merge "Synchronize the NetworkStatsFactory constructor." 2019-06-27 07:53:21 +00:00
Chalard Jean
b1d9ad9287 Merge "Simplify Exception expressions in CSTest" 2019-06-27 07:09:36 +00:00
Chalard Jean
978cca8972 Merge "Unify assertThrows" 2019-06-27 07:08:59 +00:00
Treehugger Robot
1b3687c0e9 Merge "Add textview and framelayout inflation cases, refactor." 2019-06-27 04:24:25 +00:00
Treehugger Robot
609ac6fe3a Merge "Fix equals API bug on TvTrackInfo" 2019-06-27 03:40:27 +00:00
Treehugger Robot
105851c17f Merge "Add extcon specific UEventObserver" 2019-06-27 02:09:06 +00:00
Carmen Jackson
8be08e5679 Add textview and framelayout inflation cases, refactor.
This change adds a base activity to inflate views, and then adds two
more views to inflate: one with 1000 TextViews and the other with 1000
FrameLayouts in a LinearLayout nested inside a ScrollView.

This change also adds launcher icons for each of the new cases for
ease in testing a launcher-based start.

Bug: 132721345
Test: Verified that the layout segments appear in traces as expected.

Change-Id: Id8c3e867a1ad5df5c3322ce5d69c9b4255042b69
2019-06-26 18:59:09 -07:00
Alex Buynytskyy
54bc47ad38 Removing an extra installd call.
There's no need to try to create the oat dir over and over again, especially since it involve an extra installd call. Creating it (if supported) on the fly during the dexopt call.

Change-Id: Id87165e5daaa4b0f1df8d6e985edb52fedc7db47
Test: refactoring CL. Existing unit tests still pass.
2019-06-26 13:08:00 -07:00
Treehugger Robot
a1cae83560 Merge "Route KernelWakelockReader's userspace native wakelock stats collection to SystemSuspend (ISuspendControl::getWakeLockStats())" 2019-06-26 18:16:34 +00:00
Colin Cross
170b097332 Merge "Pass --legacy to aapt2 compile for SystemUI" 2019-06-26 17:05:33 +00:00
Lorenzo Colitti
8b577139ae Transfer ownership of NetworkStatsFactory to NetworkStatsService.
NetworkStatsService is the only consumer of the data coming from
NetworkStatsFactory, but the factory itself is instantiated and
owned by NetworkManagementService.

Move it into NetworkStatsService instead.

Test: atest FrameworksNetTests
Change-Id: I52df1e545c646927952579da22845a12d1d7563b
2019-06-26 19:29:51 +09:00
Bernie Innocenti
e89c9dc529 Merge "Add NS_R_INTERNAL_ERROR item into NsRcode" 2019-06-26 08:06:01 +00:00
Treehugger Robot
dec76b8a40 Merge "PhoneWindowManager/KeyEvent: Camera key as WakeKey" 2019-06-26 06:49:21 +00:00
lifr
90d23411f4 Add NS_R_INTERNAL_ERROR item into NsRcode
Bug: 133111380
Test: ./out/host/linux-x86/bin/statsd_testdrive 116
Change-Id: I25e9244c82126cc8f09abe4639c9a0af2164e5f1
2019-06-26 10:36:59 +08:00
Kyeongkab.Nam
37be9f904a Fix equals API bug on TvTrackInfo
Member variable of mVideoActiveFormatDescription is not compared
on equals API. The variable should be compared on the equals API.

Test: build
Change-Id: Ib8fde63afb0504140f34ebd695f4524db9c74748
2019-06-26 11:13:53 +09:00
Nathan Harold
44173ee7b0 Revert "Use TM SubId in getDataState and getDataActivity"
This reverts commit b2ab846cf4.

Reason for revert: Decision has been made to keep the unsupported AIDL API.

Change-Id: I31219606974019ac46da789ec31ca9cb3a86eb13
2019-06-26 00:41:00 +00:00
Kalesh Singh
759af3274d Route KernelWakelockReader's userspace native wakelock stats
collection to SystemSuspend (ISuspendControl::getWakeLockStats())

Native wakelocks obatined via SystemSuspend when useSuspendCounter is
enabled, will not be reflected in the information available from
/d/wakeup_sources or proc/wakelocks. This information has been
made available via the ISuspendControl AIDL interface of SystemSuspend.
Kernelwakelock stats however are still being collected in the
/d/wakeup_sources.

Change-Id: I208d004aa0fabcf367016faae77ad51388cdf0ea
Bug: 135680393
Test: Observe SystemSuspend service wakelocks in dumpsys batterystats (for
instance, "PowerManager.SuspendLockout"):
`dumpsys batterystats --checkin | grep wl | grep PowerManager.SuspendLockout`
2019-06-25 16:31:38 -07:00
Xiangyu/Malcolm Chen
b6ae55b169 Merge "When data switches during voice call, make sure signal bar updates it." 2019-06-25 18:06:16 +00:00
Chen Xu
b6399511f8 Merge "move short code definitions to SmsManager Test API" 2019-06-25 17:18:46 +00:00
Remi NGUYEN VAN
f2aa4ce4bd Merge "Only show "Connected" note after opening portal" 2019-06-25 15:20:33 +00:00
Chalard Jean
b92b18b9b9 Simplify Exception expressions in CSTest
Test: CSTest
Change-Id: I2c7d9e3092497526ab7d87b40a508f2d4bc3d7a2
2019-06-25 20:40:41 +09:00
Chalard Jean
751bb3f7a7 Unify assertThrows
Test: atest FrameworksTestsNet NetworkStackTests
Change-Id: Ib6d5d2577a5b95f90857d8d146b00af516e9944d
2019-06-25 20:40:39 +09:00
Remi NGUYEN VAN
0839a191bc Only show "Connected" note after opening portal
The "Connected" notification would be shown every time a network
validates after being identified as a captive portal. This causes issues
on networks that have auto-login mechanisms, as a high priority
notification would be shown even though the user was not interacting
with the phone.

The "Connected" notification is intended to confirm to the user that
they successfuly logged in (manually), so only show it after the user
opens the portal on the network.

Bug: 134124044
Test: Flashed, connected to portal: notification shown
      Opened portal from command line + revalidate: no notification
      Tests passing with change, failing without

Change-Id: I89e7a7f49019bd7e4686712c56e00bd786eb3ef3
2019-06-25 19:18:16 +09:00
Lorenzo Colitti
2bcbc35050 Synchronize the NetworkStatsFactory constructor.
This ensures the constructor takes the necessary lock before
accessing memmber variables.

Bug: 113122541
Test: atest FrameworksNetTests
Change-Id: Ibd324ed922c738b8d77d4eb74f45b75c6645bdc7
2019-06-25 18:58:42 +09:00
Neil Fuller
b8bdc72174 Merge "Migrate telephony code away from Time" 2019-06-25 08:48:17 +00:00
Lorenzo Colitti
08b928e8ed Merge "NetworkStats: Fix race condition causing system server crashes" 2019-06-25 07:54:17 +00:00
Remi NGUYEN VAN
7e5a5a6983 Merge "Fix leak of DhcpServer on tethering stop error" 2019-06-25 07:52:53 +00:00
Felix
2deb9b54d9 PhoneWindowManager/KeyEvent: Camera key as WakeKey
As discussed in https://r.android.com/973723

This makes any camera key event wake up the device.
Handling of the camera key apart from waking up the device might follow
in a later commit.

Signed-off-by: Felix <google@ix5.org>
Change-Id: I44dbc3f9ac465f664b6d740cb6a056b7f6e118fb
2019-06-25 06:41:12 +02:00
Treehugger Robot
867956b55c Merge "BT: Add CAP_NET_ADMIN for Bluetooth Process" 2019-06-25 01:54:31 +00:00
Hugo Benichi
96dc0c118c NetworkStats: Fix race condition causing system server crashes
NetworkStatsService uses an internal boolean to know when it has
started for the purpose of preventing access to other internal
variables before they are initialized.

However that boolean is set to true in systemReady() non-atomically
with respect to the initialization of the other variables it guards,
which can cause the system server to crash.

This patch fixes this concurrency bug by moving setting the internal
boolean flag and the variable it guards in one atomic synchronized
block.

This patch also removes code checking if bandwidth control is enabled,
because this is now always true.

Bug: 132767673
Test: Compiled.
Change-Id: Ia089b5767ce271d669879c975508654d4dd03429
2019-06-25 10:51:51 +09:00
Nitin Shivpure
99cec9d9a4 BT: Add CAP_NET_ADMIN for Bluetooth Process
Precondition:
1. A reference phone has internet connection and with BT tethering enabled.
2. DUT is in PANU role & Remote is NAP role
Or
1. DUT has internet connection and with BT tethering enabled.
2. DUT is in NAP role & Remote is PANU role.

Use case:
1. Connect DUT(PANU) to reference phone(NAP).
2. Internet browse is not working on DUT & Connection is dropped from DUT.
Or
1. Connect remote(PANU) to Remote device(NAP).
2. Internet browse is not working on remote & Connection is dropped fro DUT.

RCA:
https://android-review.googlesource.com/c/kernel/common/+/936980 will cause this issue. If it's cherrypicked in codebase.
TUNSETIFF ioctl call is being failed due to Operation not permitted error, Hence bt-pan interface is not being up.&
connection is dropped.
06-04 23:18:06.856  6173  6699 D bt_btif : ioctl error:-1, errno:Operation not permitted

TEST:
1. Connect DUT(PANU) to reference phone(NAP).
2. Internet browse is  working on DUT
Or
1. Connect remote(PANU) to Remote device(NAP).
2. Internet browse is working on remote.

Fix:
BT Process need CAP_NET_ADAMIN capability to make
ioctl call to TUN driver from BT PAN module. Hence
adding CAP_NET_ADMIN capablity for BT

Bug: 133735703
Bug: 135707477
Change-Id: Ie461bfee7a8221404ed6b9852bd5d36758d094df
2019-06-24 23:25:31 +00:00
chen xu
0276e13b96 move short code definitions to SmsManager Test API
Bug: 127560420
Test: cts
Change-Id: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
(cherry picked from commit 9c7fad9235)
Merged-in: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
2019-06-24 21:12:48 +00:00
Steven Moreland
95f507f80d Merge changes Ic2e27f56,Ie19e0995
* changes:
  Remove references to setPermissionController.
  ServiceManagerNative: delete unused methods
2019-06-24 18:43:29 +00:00
Steven Moreland
f961b9632f Merge "Remove obsolete reference to ServiceManagerNative." 2019-06-24 18:02:34 +00:00
Remi NGUYEN VAN
6dcffa0c77 Fix leak of DhcpServer on tethering stop error
Tactical, minimal fix to make sure the DhcpServer is stopped when
disabling tethering. The current code may throw if the interface is gone
when calling mNMService.setInterfaceConfig() on teardown. Make sure DHCP
is stopped regardless of what happens.

A longer term fix will be to figure out the right flow to teardown the
interface and avoid errors on setInterfaceConfig().

Bug: 124520692
Test: Manual: no more socket leaked when stopping USB tethering
Change-Id: Ib87d89a2e5fdb64b8f3dfae48d82c970f3ae6161
2019-06-24 23:28:06 +09:00
Lorenzo Colitti
a5b124cce3 Merge "Don't auto-connect to networks that have no/limited connectivity." 2019-06-24 10:45:51 +00:00
Lorenzo Colitti
2299133d8f Don't auto-connect to networks that have no/limited connectivity.
Auto-reconnecting to a network with no or limited Internet
connectivity is not useful. This is because such networks cannot
be used unless the user taps the notification and interacts with
the resulting dialog. But the notification is only shown if the
user manually connects to the network, not if the system
auto-connects to it.

Bug: 130683832
Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I5413393529c4bad3a707df229307542486bcff33
Merged-In: I5413393529c4bad3a707df229307542486bcff33
2019-06-24 11:39:18 +09:00
Steven Moreland
f54791b388 Remove references to setPermissionController.
This method isn't implemented/used/etc..

Bug: 135768100
Test: TH
Change-Id: Ic2e27f5685cc16562815fcaf1226bc7789f8d882
2019-06-21 18:51:07 -07:00