drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
315,635 Commits 1 Branch 0 Tags
Commit Graph

315635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f50191ef0f Merge "Import translations. DO NOT MERGE" into oc-dev am: 05c71b3bbe -s ours 
am: 2d8e49dace  -s ours

Change-Id: Iec97570d815d27c79482d29b5612fa71edcb44fe
 2017-04-13 16:24:32 +00:00
Bill Yi
2d8e49dace Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 05c71b3bbe  -s ours

Change-Id: Id75778a6260e4cf090b4dd574654ff1e9e20ce93
 2017-04-13 16:12:29 +00:00
Bill Yi
fe23c2afbb Merge "Import translations. DO NOT MERGE" into oc-dev am: 2f522fc904 -s ours 
am: ca2721f9bd  -s ours

Change-Id: I827bb1a6d767d29c53af7cbe069f4f6206fd24bd
 2017-04-13 16:06:46 +00:00
Bill Yi
ca2721f9bd Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 2f522fc904  -s ours

Change-Id: I38570abe304599739f9e4dd8c450f9ae0b25a7d4
 2017-04-13 15:55:30 +00:00
TreeHugger Robot
f5ce5e822e Merge "Import translations. DO NOT MERGE" 2017-04-13 15:55:29 +00:00
TreeHugger Robot
05c71b3bbe Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:55:03 +00:00
TreeHugger Robot
1540fb2b02 Merge "Import translations. DO NOT MERGE" 2017-04-13 15:54:19 +00:00
Bill Yi
f9dabd92a2 Merge "Import translations. DO NOT MERGE" into oc-dev am: 023c36f89f -s ours 
am: 466cbb6daa  -s ours

Change-Id: Ibf6ead452623d83ed672e9355aa294f49325fac7
 2017-04-13 15:51:50 +00:00
Bill Yi
2721ceb164 Merge "Import translations. DO NOT MERGE" into oc-dev am: 9e8fa5ec61 -s ours 
am: d232463193  -s ours

Change-Id: Ibda3fa55ced29f7ad8001cc4a1bc1c077eca3351
 2017-04-13 15:50:56 +00:00
Hugo Benichi
9514ba78d3 Merge changes I33ac2b52,I5ab8bb11 into oc-dev am: 7270534ac4 -s ours 
am: a295bdce7f  -s ours

Change-Id: If82dbc281727166a418cdb0ca905064a62df5d29
 2017-04-13 15:50:05 +00:00
TreeHugger Robot
dfbd46697e Merge changes I47694963,Ia4b33fd4,Id04f9080 
* changes:
  Connectivity metrics: add transports to connect stats
  Connectivity metrics: log DnsEvents in-band
  Connectivity metrics: add transports pretty printing
 2017-04-13 15:46:26 +00:00
TreeHugger Robot
12b4dd775b Merge "Import translations. DO NOT MERGE" 2017-04-13 15:45:21 +00:00
TreeHugger Robot
2f522fc904 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:42:31 +00:00
Bill Yi
466cbb6daa Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 023c36f89f  -s ours

Change-Id: I4c1239ade7c3d827cbf6f209ef0375ab5420a9e1
 2017-04-13 15:39:27 +00:00
Bill Yi
d232463193 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 9e8fa5ec61  -s ours

Change-Id: I0bb86e97bf9e1dbe7aa0de9ba4bde9e72bce7440
 2017-04-13 15:38:21 +00:00
Hugo Benichi
a295bdce7f Merge changes I33ac2b52,I5ab8bb11 into oc-dev 
am: 7270534ac4  -s ours

Change-Id: I98536197e3c4096badcc197ffac7b72836ac00dd
 2017-04-13 15:37:10 +00:00
Julia Reynolds
223330a0c7 Only foreground notis should be sorted higher am: 889280c4c3 
am: 1a6ac41f72

Change-Id: I5560a2f0f3a8d8f589882d0214e2f974d266b092
 2017-04-13 15:31:38 +00:00
TreeHugger Robot
023c36f89f Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:27:27 +00:00
TreeHugger Robot
9e8fa5ec61 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:26:29 +00:00
TreeHugger Robot
7270534ac4 Merge changes I33ac2b52,I5ab8bb11 into oc-dev 
* changes:
  Captive portal: fix probe urls at network creation
  NetworkMonitor: improve captive portal validation logs
 2017-04-13 15:26:05 +00:00
TreeHugger Robot
af05d3952f Merge "Import translations. DO NOT MERGE" 2017-04-13 15:25:35 +00:00
Julia Reynolds
1a6ac41f72 Only foreground notis should be sorted higher 
am: 889280c4c3

Change-Id: I755fc0766540a8e836fcd98901c87e4d1ee335c1
 2017-04-13 15:19:09 +00:00
Niels Egberts
8efed2eba0 Merge "Document examples where a developer might use the APIs." into oc-dev am: 3a543a1bd2 
am: 937f46ffd1

Change-Id: I7a8a01512ec5f544c3939d817d0baae8521d9e71
 2017-04-13 15:07:22 +00:00
Julia Reynolds
889280c4c3 Only foreground notis should be sorted higher 
Having the ongoing flag is not enough.

Test: runtest systemui-notification
Change-Id: I8a6c15af819f2bb4ad3937ae45d33361663fbe13
 2017-04-13 11:03:57 -04:00
Niels Egberts
937f46ffd1 Merge "Document examples where a developer might use the APIs." into oc-dev 
am: 3a543a1bd2

Change-Id: I2c9e5961381e8b7dc1e46b96c704a52ec430e80e
 2017-04-13 14:54:59 +00:00
Dianne Hackborn
5d0edfcf13 Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev am: 809f4cf121 
am: 80cc3154ee

Change-Id: I3d4eb3d0a2922afc1a3ef1a78cc4dae67f103163
 2017-04-13 14:48:33 +00:00
Dianne Hackborn
80cc3154ee Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev 
am: 809f4cf121

Change-Id: I56946e9a2868ea232a02fa2c4919d33c9d0647c0
 2017-04-13 14:42:33 +00:00
TreeHugger Robot
3a543a1bd2 Merge "Document examples where a developer might use the APIs." into oc-dev 2017-04-13 14:41:59 +00:00
TreeHugger Robot
809f4cf121 Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev 2017-04-13 14:32:41 +00:00
Hugo Benichi
dfc2cc5857 Connectivity metrics: add transports to connect stats 
This patch groups connect() events per netId. It adds netid and
transport information to serialized ConnectStatistics events.

Test: updated NetdEventListenerServiceTest
      updated IpConnectivityMetricsTest
      $ runtest frameworks-net passes
Bug: 34901696

Change-Id: I4769496383943e714a1d350c298e093c2ed57477
 2017-04-13 23:08:28 +09:00
Hugo Benichi
0699cf9804 Connectivity metrics: log DnsEvents in-band 
This patch changes how DnsEvents are logged in IpConnectivityMetrics.
The following changes are made:
 - DnsEventBatch are not logged after 100 queries on the same network
    - this allows to merge DnsEvent and DnsEventBatch into one class
 - DnsEventBatch are not logged after a network disconnect
    - this allows to remove the NetworkCallback
 - DnsEvent are now logged similarly to ConnectStats when statistics are
   flushed, in a direct call from IpConnectivityMetrics into
   NetdEventListenerService, in a direct call from IpConnectivityMetrics
   into NetdEventListenerService.
    - this allows to remove the Parcelable implementation of DnsEvent
 - transports information is added to DnsEvent.

Test: - simplified NetdEventListenerServiceTest covering dns logging
      - updated IpConnectivityEventBuilderTest
      - updated IpConnectivityMetricsTest
      - $ runtest frameworks-net passes
      - manually verified $ adb shell dumpsys connmetrics list proto
Bug: 34901696

Change-Id: Ia4b33fd4212741152662a2adbb0533bd1b4902ee
 2017-04-13 23:08:20 +09:00
Hugo Benichi
df456e13a1 Connectivity metrics: add transports pretty printing 
This patch also
  - partially reverts commit f927f0c52e7df5b057e7d28888c3cfed164d241a
    that exposed a getTransports method on NetworkCapabilities.
  - moves enumerateBits to BitUtils (as unpackBits), and adds the
    reverse packBit method.

Bug: 34901696
Test: manually looked at $ adb shell dumpsys connmetrics list
Change-Id: Id04f9080e7f75608deeb49306aec34941e71794c
 2017-04-13 23:08:05 +09:00
Hugo Benichi
c03829d362 Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 am: 4d47eba86a am: 4d47a6a26b 
am: e90070d528

Change-Id: I4c26b3bf4ae6179193768783781aa8fbe0ac92cc
 2017-04-13 13:59:55 +00:00
Orion Hodson
e5983e5270 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 am: 0f7294af11 am: 2d5f14e578 
am: c05219d7b3

Change-Id: I5f34ed353c0892d4afadd4869ba7950dc9bd10ca
 2017-04-13 13:58:18 +00:00
Hugo Benichi
e90070d528 Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 am: 4d47eba86a 
am: 4d47a6a26b

Change-Id: Ib4dd12ee716fbc06e1fbfbb2e0445836b1e7c475
 2017-04-13 13:52:21 +00:00
Orion Hodson
c05219d7b3 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 am: 0f7294af11 
am: 2d5f14e578

Change-Id: I9b7a384143ec2dfe3ee55d3949843797f1325d7f
 2017-04-13 13:46:57 +00:00
Hugo Benichi
4d47a6a26b Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 
am: 4d47eba86a

Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc
 2017-04-13 13:46:32 +00:00
Orion Hodson
2d5f14e578 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 
am: 0f7294af11

Change-Id: Ib22190f899dfe6c1440fd70725958f1a767674ae
 2017-04-13 13:40:32 +00:00
Hugo Benichi
4d47eba86a Merge "Revert "Captive portal: rotate fallback urls"" 
am: 9ea45b6106

Change-Id: Iea6582b4c7f347c24ebccf815256dd7125ab29de
 2017-04-13 13:40:04 +00:00
Orion Hodson
0f7294af11 Merge "Unhide MethodHandles.explicitCastArguments()" 
am: 891cab55d3

Change-Id: I6406a01c50df40a59e3af5432c1f31309cdb43e5
 2017-04-13 13:34:27 +00:00
Seigo Nonaka
193743ad1c Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev am: 061db23b79 
am: c0c5763793

Change-Id: Ibe1167effdbe6ae39f10793691e2722900cd7af7
 2017-04-13 13:33:28 +00:00
Seigo Nonaka
c0c5763793 Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev 
am: 061db23b79

Change-Id: I7a7d47db8dedd6f75d4884d635cbfcf15949ac43
 2017-04-13 13:27:57 +00:00
Hugo Benichi
9ea45b6106 Merge "Revert "Captive portal: rotate fallback urls"" 2017-04-13 13:25:42 +00:00
Treehugger Robot
891cab55d3 Merge "Unhide MethodHandles.explicitCastArguments()" 2017-04-13 13:25:12 +00:00
TreeHugger Robot
061db23b79 Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev 2017-04-13 13:22:10 +00:00
Niels Egberts
04637f3d4d Document examples where a developer might use the APIs. 
Test: mmma frameworks/base/
Bug: 35767714

Change-Id: I845db36869b84a18e79d7fe28f10031cfe836617
 2017-04-13 13:52:07 +01:00
Tony Mak
0d801659d9 Merge "Add hidden API startActivityForResultAsUser" into oc-dev am: bb14fb9acb 
am: 76979ccddc

Change-Id: I1f8f2a01bfa5bf8f1995efb85df89098a2ec21ea
 2017-04-13 12:43:49 +00:00
Hugo Benichi
2e43e45e1e Revert "Captive portal: rotate fallback urls" 
After discussion in the cl we agreed to use "|" as a separator. However  String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.

Will revert and resubmit with a comma.

This reverts commit 0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.

Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
 2017-04-13 12:43:49 +00:00
Tony Mak
76979ccddc Merge "Add hidden API startActivityForResultAsUser" into oc-dev 
am: bb14fb9acb

Change-Id: Iad4f51ffb4cdfaef1aeb312f92284cfad309b978
 2017-04-13 12:36:35 +00:00
TreeHugger Robot
bb14fb9acb Merge "Add hidden API startActivityForResultAsUser" into oc-dev 2017-04-13 12:13:03 +00:00