Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
322,731 Commits 3 Branches 0 Tags
cd3633fc01ffb81733c09f37549c4e5b2283bb71
Commit Graph

71628 Commits

Author SHA1 Message Date
Benjamin Miller
84a4d3de65 Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev 
am: d726ff988c

Change-Id: I031f226a4324521a8940453c96da870a49767233
 2017-07-17 22:39:28 +00:00
Neil Fuller
444616f4bf Merge "Remove TODOs that are not needed" am: 0f9842304a 
am: 5c2cfc51c5

Change-Id: Ia585380cb88829bf55171092389b77081d941f17
 2017-07-17 22:32:38 +00:00
TreeHugger Robot
d726ff988c Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev 2017-07-17 22:28:09 +00:00
Neil Fuller
5c2cfc51c5 Merge "Remove TODOs that are not needed" 
am: 0f9842304a

Change-Id: Ie46a57ce88e25e40193b073c0add69adccc14a79
 2017-07-17 22:24:36 +00:00
Neil Fuller
0f9842304a Merge "Remove TODOs that are not needed" 2017-07-17 22:15:08 +00:00
xutianguo
a5325e18df Make BluetoothStateChangeCallback oneway to prevent waiting on response. 
Test: Connected bluetooth devices(included Headset/HID devices), and
made bluetooth enabling/disabling over 1000 times, no other side effect
observed.

Bug: 38485770

Change-Id: Ia3959d2441aece39a79ab2d662b57790a78df674
Signed-off-by: xutianguo <xutianguo@xiaomi.com>
(cherry picked from commit 95e1e21a639318bb3399c394707624393cfa2300)
 2017-07-17 11:52:24 -07:00
Benjamin Miller
7afa84c373 Docs-change: clarification of LauncherApps.getApplicationInfo() 
Staged at: go/dac-stage/reference/android/content/pm/LauncherApps.html#getApplicationInfo(java.lang.String, int, android.os.UserHandle)

Test: make ds-docs and output staged
Bug: 38024981
Change-Id: I9f256d675433457b7c85fa111ed87d1147f1f2bc
 2017-07-17 18:35:38 +00:00
Neil Fuller
a9f0eeb36f Remove TODOs that are not needed 
Remove TODOs to add classes to the system API that are not needed
(since they are used by a platform-only app).

Bug: 31008728
Test: make droid
Change-Id: I0d75686ddeae929e9d87c5ca8703a609a1450d76
Merged-In: I600e7b08853b86b27463193411cf85207ae09ce8
 2017-07-17 17:57:11 +01:00
Benjamin Miller
3082216de2 Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev 
am: ca007e525b

Change-Id: Ife96d44a6c8687be49616562f1834c1e2cc17b7d
 2017-07-17 14:22:24 +00:00
TreeHugger Robot
ca007e525b Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev 2017-07-17 14:11:55 +00:00
Peng Xu
6c5ee3d894 Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev 
am: 17e641dae5

Change-Id: I3689c95bb249a77e6736f66e23065474a0916b9f
 2017-07-14 23:07:11 +00:00
TreeHugger Robot
17e641dae5 Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev 2017-07-14 22:55:15 +00:00
Mathieu Chartier
811fa6d001 Merge "Add more details to dumpsys meminfo -d" am: 4ccf8b83a1 
am: 41718e2413

Change-Id: Ie3052ec70e478b69629e16526542cb616168b58b
 2017-07-14 21:47:03 +00:00
Mathieu Chartier
41718e2413 Merge "Add more details to dumpsys meminfo -d" 
am: 4ccf8b83a1

Change-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904
 2017-07-14 21:37:43 +00:00
Mathieu Chartier
cb86245b99 Add more details to dumpsys meminfo -d 
Added new subitems for
.dex:
boot vdex
app vdex
app odex

.art
app art
boot art

Fixed accounting for dalvik other to be subitems of other subsection
instead of dalvik.

Sample output:
261,892K: Native
213,196K: .dex mmap
    111,620K: .App vdex
    65,070K: .App dex
    36,506K: .Boot vdex
192,320K: EGL mtrack
161,835K: .so mmap
134,922K: .apk mmap
85,612K: Dalvik
    74,656K: .Heap
    4,526K: .Zygote
    4,218K: .LOS
    2,212K: .NonMoving
64,906K: Unknown
52,119K: .oat mmap
42,828K: Dalvik Other
    32,704K: .LinearAlloc
    3,672K: .JITCache
    3,248K: .IndirectRef
    3,204K: .GC
40,754K: .art mmap
    31,133K: .Boot art
    9,621K: .App art
21,976K: Other mmap
20,704K: Stack
16,270K: Gfx dev
9,200K: GL mtrack
3,428K: Other dev
2,744K: .ttf mmap
1,116K: Ashmem
1,052K: .jar mmap
0K: Cursor
0K: Other mtrack

Test: dumpsys meminfo -d
Test: dumpsys meminfo -s
Test: dumpsys meminfo
Test: dumpsys meminfo <pid>
Test: dumpsys memifno -d <pid>

Bug: 32331673

(cherry picked from commit 95550dd394)

Change-Id: I7557ee09510651c7b5ddee646c92adbcdd3472db
 2017-07-14 12:14:59 -07:00
Benjamin Miller
28a3e85903 Docs: VPNs under Android O should promote to the foreground 
Add note for VPN developers that VPN apps started in the background must transition to the foreground in Android O to avoid the system stopping them.

Staged at: go/dac-stage/reference/android/net/VpnService.html

Test: make ds-docs
Bug: 38023983
Change-Id: I33c7ca1717c332ffab495eb51c4c6b9c5c304cef
 2017-07-14 17:22:47 +02:00
Hugo Benichi
164ff8a2ed resolve merge conflicts of 4f2a0fe213 to stage-aosp-master 
am: a428392c1d

Change-Id: Ide67520d074330ec050ded71118bff0bc88be784
 2017-07-14 00:37:20 +00:00
Hugo Benichi
a428392c1d resolve merge conflicts of 4f2a0fe213 to stage-aosp-master 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031
 2017-07-14 07:25:51 +09:00
Treehugger Robot
4f2a0fe213 Merge "IpManager: define InitialConfiguration" 2017-07-13 20:45:21 +00:00
Timur Iskhakov
9cdec3943c Merge "Add configureRpcThreadpool to java interface" am: d8dab11547 
am: 791a698a6a

Change-Id: I9b98013a894aa01268ed69a14c6b425e04771936
 2017-07-13 19:27:37 +00:00
Hugo Benichi
fd31b9d46e IpManager: define InitialConfiguration 
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.

At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.

This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
  1) easy extensibility for new test case,
  2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.

Bug: 62988545
Test: added new test in FrameworksNetTests,
      $ runtest frameworks-net
      $ runtest frameworks-wifi
Merged-In: I060b02603af7d73a6407df89344bf0c000574af2

(cherry pick of commit 2757fcf3a1)

Change-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53
 2017-07-14 04:26:42 +09:00
Timur Iskhakov
791a698a6a Merge "Add configureRpcThreadpool to java interface" 
am: d8dab11547

Change-Id: I958ef6fc2d667a691e39e9fadd07303085a499f9
 2017-07-13 19:21:42 +00:00
Treehugger Robot
d8dab11547 Merge "Add configureRpcThreadpool to java interface" 2017-07-13 19:11:39 +00:00
Fyodor Kupolov
cd816c1853 Merge "Revert "Fix ContentObserver unregister issue"" am: 31419a4ad4 
am: 8625194c19

Change-Id: I5025d99e35dd267ffc3a0c0393a24ebb87cc0546
 2017-07-13 03:56:09 +00:00
Fyodor Kupolov
8625194c19 Merge "Revert "Fix ContentObserver unregister issue"" 
am: 31419a4ad4

Change-Id: I455be72533c24ceb5ea352774ded30d0c0a2367f
 2017-07-13 03:49:36 +00:00
Treehugger Robot
31419a4ad4 Merge "Revert "Fix ContentObserver unregister issue"" 2017-07-13 03:38:46 +00:00
Fyodor Kupolov
5d5f04b004 Revert "Fix ContentObserver unregister issue" 
This reverts commit 2df4e144a9. 
It was causing failures in packages/apps/DocumentsUI tests

Bug: 63638102
Bug: 63154326
Change-Id: I51fb54f705f58f159f4fcc30bfed41ababcba950
 2017-07-13 01:46:23 +00:00
Timur Iskhakov
b6a6283ce4 Add configureRpcThreadpool to java interface 
Bug: 36233029
Test: links, compiles, hidl_test_java

Change-Id: I7e2ec88b2098886983b1d93ab100a77db63f3976
 2017-07-12 17:56:39 -07:00
Neil Fuller
92189b6e21 Merge "Address further API review comments" am: b279ec51b6 
am: cf8e06c0ac

Change-Id: I7364fbcc09eaf47a3c90def9fd03b5f9f1d92a7d
 2017-07-12 15:59:57 +00:00
Neil Fuller
cf8e06c0ac Merge "Address further API review comments" 
am: b279ec51b6

Change-Id: Idbb8fc5c6e6cd912acbca1b5b144533dbfff2775
 2017-07-12 15:52:20 +00:00
Treehugger Robot
b279ec51b6 Merge "Address further API review comments" 2017-07-12 15:37:40 +00:00
Hugo Benichi
59de81533d Merge "Add first OWNERS files for core networking" am: 4066930a36 
am: 531cae76fd

Change-Id: I099ee71d8b9ed767af2f4556e4798a1263dab9c0
 2017-07-12 04:01:15 +00:00
Hugo Benichi
531cae76fd Merge "Add first OWNERS files for core networking" 
am: 4066930a36

Change-Id: Ib8e1b85be03ad5e75a89a7951a59b9bc2a04d112
 2017-07-12 03:54:57 +00:00
Treehugger Robot
4066930a36 Merge "Add first OWNERS files for core networking" 2017-07-12 03:41:57 +00:00
Hugo Benichi
357b58cdab Add first OWNERS files for core networking 
Covering
  core/java/android/net/
  core/java/com/android/server/net/
  packages/CaptivePortalLogin/
  services/core/java/com/android/server/
    ConnectivityService.java
    NsdServic.java
    NetworkManagementService.java
  services/core/java/com/android/server/connectivity/
  services/net/
  tests/net/

Android core networking files not covered:
  services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
  services/core/proto/ipconnectivity.proto (path unique to aosp)

Bug: 63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa
 2017-07-12 09:25:15 +09:00
Jack He
778d7cd3a7 Merge "GATT: Expose opportunistic client API to Java" am: 782ba0aca8 
am: f0efa2c810

Change-Id: I242ede1cfe035f51920a5a1cb90cf0616bae1e93
 2017-07-11 20:37:36 +00:00
Jack He
f0efa2c810 Merge "GATT: Expose opportunistic client API to Java" 
am: 782ba0aca8

Change-Id: If29bc145c1947f2e10472565ae753696e8057dd1
 2017-07-11 20:23:53 +00:00
Jack He
13f52c8118 GATT: Expose opportunistic client API to Java 
* Allow Java based programs to create an opportunistic GATT client
* Such client does not hold a GATT connection. It automatically
  disconnects when no other GATT connections are active for the
  remote device.

Bug: 63347806
Test: make, run battery service
Change-Id: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec
 2017-07-11 18:02:52 +00:00
Neil Fuller
493781a5bf Address further API review comments 
Address further API review comments from API reviewer.

Bug: 31008728
Test: make droid
Change-Id: I0b3f6be9eaf69ffa8a6e73475f9c3a9ba3e343f2
 2017-07-11 16:12:29 +01:00
Bin Chen
4d4b9a2ac6 Merge "Fix typo in Parcel javadoc." am: ed0e6009df 
am: d29e275b5b

Change-Id: Id1fa7cc2948153697c8c34a2e4db632153218162
 2017-07-11 11:17:15 +00:00
Bin Chen
d29e275b5b Merge "Fix typo in Parcel javadoc." 
am: ed0e6009df

Change-Id: I06d3ac4d00cfec5179ca6e636365617c644f9fcd
 2017-07-11 11:10:23 +00:00
Treehugger Robot
ed0e6009df Merge "Fix typo in Parcel javadoc." 2017-07-11 10:58:30 +00:00
Neil Fuller
9e86604cbd Merge "Merge "Move column definitions to an inner class" am: ab0bb48965" into stage-aosp-master 
am: cb996b5574

Change-Id: I42513c054183772a27fb985cee66440a88003143
 2017-07-11 10:16:54 +00:00
Hugo Benichi
6659fdba55 Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master 
am: 6ab950dd5f

Change-Id: I23fbbc7bf6ec53dc04ba4328166038f19b972268
 2017-07-11 10:15:19 +00:00
Android Build Merger (Role)
cb996b5574 Merge "Merge "Move column definitions to an inner class" am: ab0bb48965" into stage-aosp-master 2017-07-11 10:08:59 +00:00
Neil Fuller
fb3804d720 Merge "Move column definitions to an inner class" 
am: ab0bb48965

Change-Id: Ie9fa51f05dc7df781e9e9bdeb9d3c21ca4cde6c8
 2017-07-11 10:07:37 +00:00
Neil Fuller
ab0bb48965 Merge "Move column definitions to an inner class" 2017-07-11 10:01:01 +00:00
Robert Quattlebaum
eadb452d72 NetworkCapabilities: Added support for TRANSPORT_LOWPAN 
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.

Bug: b/33073713
Test: builds
Change-Id: I50d9b8df1a0270e06c28f001adf6c52a142a85af
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689

(cherry pick from commit 557e0c38b9)
 2017-07-11 15:52:37 +09:00
Bin Chen
b6b12b567d Fix typo in Parcel javadoc. 
Change-Id: Ida05259143e86c15c2ed69eeb7566d39b60fa823
 2017-07-11 11:01:44 +08:00
Neil Fuller
d07c331349 Move column definitions to an inner class 
Move column definitions and other URI constants
to inner classes based on feedback from an API council
reviewer.

Bug: 31008728
Test: make droid
Change-Id: I213e44f2655017e0ca32a4dfb1f5617ef471d854
 2017-07-10 20:02:56 +01:00