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

307768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Gaillard
677f0d6c7c Merge "Update asm version in layoutlib following Change I2a6396e7" 2017-02-16 13:30:22 +00:00
Hemant Gupta
95939990ee Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am: 3ac3170a4b am: 1112046506 am: ff3f4e72af 
am: 853d024b98

Change-Id: I6655ce33890d65be844b7a8e471ebf12ed800a6c
 2017-02-16 13:24:18 +00:00
Shigeki Yokomichi
df47bee061 Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a am: 657abc315d am: 4b06345751 
am: bce364b776

Change-Id: Ia47be383cbc07818a7a51f85bfba4a30aedd3a5a
 2017-02-16 13:23:02 +00:00
Hemant Gupta
853d024b98 Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am: 3ac3170a4b am: 1112046506 
am: ff3f4e72af

Change-Id: Ic5965ea14b7b1b68b261b554063f5aae473a117d
 2017-02-16 13:18:22 +00:00
Hemant Gupta
ff3f4e72af Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am: 3ac3170a4b 
am: 1112046506

Change-Id: Ib406bdcd0f388c7fe1f226da2ae17a2c588739c9
 2017-02-16 13:14:22 +00:00
Shigeki Yokomichi
bce364b776 Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a am: 657abc315d 
am: 4b06345751

Change-Id: I2b4719d6f50533f62af22d55fb870802ead7c554
 2017-02-16 13:14:19 +00:00
Hemant Gupta
1112046506 Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." 
am: 3ac3170a4b

Change-Id: I477f407d94a43a14083fa68a7b271f5d4fe8445d
 2017-02-16 13:10:19 +00:00
Shigeki Yokomichi
4b06345751 Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a 
am: 657abc315d

Change-Id: I295d50e9513775dddb2aea3686275264d7e0f12c
 2017-02-16 13:06:27 +00:00
Treehugger Robot
3ac3170a4b Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." 2017-02-16 12:59:16 +00:00
Shigeki Yokomichi
657abc315d Merge "Fix the "Alarm volume" icon is displayed incorrectly" 
am: e0ba81110a

Change-Id: Id7996cd16fea9eccbdcd389206e77d7390cd25a2
 2017-02-16 12:58:17 +00:00
TreeHugger Robot
cc5b6a4347 Merge "Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED." 2017-02-16 12:54:55 +00:00
Treehugger Robot
e0ba81110a Merge "Fix the "Alarm volume" icon is displayed incorrectly" 2017-02-16 12:47:43 +00:00
Narayan Kamath
b3003af0f6 Merge "Zygote: Explicitly preload secondary zygote resources." 2017-02-16 12:31:07 +00:00
Diego Perez
102ef6fd53 Merge "Set the correct class loader in Resources" 2017-02-16 12:14:14 +00:00
TreeHugger Robot
e0da063b8d Merge "MediaSessionService: Keep media session list in one place" 2017-02-16 09:57:09 +00:00
Jaewan Kim
e0ca3f3882 MediaSessionService: Keep media session list in one place 
Test: Manual test
Change-Id: I954a3c6881ba415d3800ac1a2ce16b424d1a0f73
 2017-02-16 17:15:52 +09:00
Hugo Benichi
5a93b9c940 Merge "Captive portal: better detect empty responses" am: c217f7a9f3 am: af8e749820 am: 7973ff4c13 
am: 35f3288b2f

Change-Id: Iaa162a8661ca5cec350696ce71661c99d8fd1196
 2017-02-16 07:21:13 +00:00
Hugo Benichi
35f3288b2f Merge "Captive portal: better detect empty responses" am: c217f7a9f3 am: af8e749820 
am: 7973ff4c13

Change-Id: I63a3bf9f2983bdb68df7ef48b334930a089648eb
 2017-02-16 07:12:55 +00:00
Hugo Benichi
7973ff4c13 Merge "Captive portal: better detect empty responses" am: c217f7a9f3 
am: af8e749820

Change-Id: I0b2cd45fb92e2f8accb53ef4e050d2b6e7f7fd1c
 2017-02-16 07:08:27 +00:00
Hugo Benichi
af8e749820 Merge "Captive portal: better detect empty responses" 
am: c217f7a9f3

Change-Id: If6229a3a5c0ccc3575d44d11ed9f486cab35eac3
 2017-02-16 07:04:25 +00:00
Hugo Benichi
c217f7a9f3 Merge "Captive portal: better detect empty responses" 2017-02-16 06:54:48 +00:00
TreeHugger Robot
55ab689fac Merge "Auto-grant background execution and data access" 2017-02-16 06:51:08 +00:00
Tomasz Mikolajewski
17c50da4be Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED. 
Test: Not testable, as the behavior depends on the quick viewer.
Bug: 32161075
Change-Id: I46ec36fdce481930096f9ae8ee3c54df792b0233
 2017-02-16 14:53:57 +09:00
TreeHugger Robot
ff4adef9cd Merge "Create TRON events for Wifi Network Recommendations." 2017-02-16 05:25:52 +00:00
TreeHugger Robot
5653fb10a7 Merge "Introduce Backspace implemenation for flag emoji sequence." 2017-02-16 05:00:49 +00:00
TreeHugger Robot
85f8603291 Merge "Always check front stack on its current display" 2017-02-16 05:00:07 +00:00
TreeHugger Robot
59d3c40855 Merge "Minor fixes on documentation." 2017-02-16 04:36:56 +00:00
Svet Ganov
da0acdf938 Auto-grant background execution and data access 
Companion apps can declare they want background access and
background execution exceptions via dedicated permissions
in their manifest. If such a permission is requested we
auto-grant the corresponding exception after the user has
chosen a device from the companion UI. These permissions
are appop ones allowing us to use the app ops for gauging
whether the user has made a change after we auto-granted
the permission since we would like to revoke these special
privileges when the app disassociates itself from the
companion device if the user did not make an excplicit
choice otherwise.

While at this auto-grant fixed location permission to the
companion device discovery service.

Test: manual

Change-Id: I46ee4291e5e5a8f7613f0dd75eb61d6b9341f306
 2017-02-15 20:32:41 -08:00
Selim Cinek
fb08562731 Merge "Fixes a bug where children could have a colored background" 2017-02-16 04:21:33 +00:00
Hassan Shojania
c8d0e45029 Merge "Modular DRM for MediaPlayer" 2017-02-16 03:45:59 +00:00
Aaron Whyte
e0e21d9f19 Merge "Revert "Re-hide AXIS_SCROLL constant."" 2017-02-16 03:41:25 +00:00
Hugo Benichi
e3aae40d07 Captive portal: better detect empty responses 
The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.

However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.

When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.

This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.

Test: build, flashed + manual tests.
Bug: 33498325

(cherry picked from commit cb4aa4d412c7940386df9b8dd681e0d2efebfd1d)

Change-Id: Ibb9914cba72a4dab3ae76746d8889bbf083be812
 2017-02-16 12:31:30 +09:00
Sundeep Ghuman
53a7e8c844 Create TRON events for Wifi Network Recommendations. 
We will log which evaluator was used to provide the event,
and whether or not the recommendation resulted in a successful
connection.

Bug: 34384405
Test: NA
Change-Id: I091c4d7f81c5c612248374817cb5c107b6aa20e2
 2017-02-15 19:31:24 -08:00
Manu Cornet
066eaa086a Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev am: e0e08f3f41 
am: 0c09549ef4  -s ours

Change-Id: I1c45cfdd676e4c58825f3600cc0c3edec199bd59
 2017-02-16 03:20:17 +00:00
Manu Cornet
0c09549ef4 Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev 
am: e0e08f3f41

Change-Id: Iaeee64f2a6954be8560412f60f838e2483be01f0
 2017-02-16 03:13:14 +00:00
TreeHugger Robot
e0e08f3f41 Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev 2017-02-16 03:02:17 +00:00
TreeHugger Robot
3d52f79be4 Merge "Define a new config key for the recommendation provider app." 2017-02-16 02:58:53 +00:00
Hassan Shojania
06b25fb236 Modular DRM for MediaPlayer 
Bug:  34559906
Test: Manual through the test app
Change-Id: I1b1ca61e74f250d63ff5ff462905facb81fe44e0
 2017-02-15 18:44:54 -08:00
TreeHugger Robot
040e425b49 Merge changes Ia33ab1ab,I1d01ab5d 
* changes:
  AOD: Add toggle for waking up instead of ambient display on sensors
  AOD: Refactor DozeMachine to allow waking up
 2017-02-16 02:28:23 +00:00
TreeHugger Robot
8d6a617069 Merge "Removing PiP from SysUI tuner." 2017-02-16 02:23:03 +00:00
Hall Liu
7ff09b3024 Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev am: 4d3435637f -s ours 
am: dbf6f9263d  -s ours

Change-Id: I403da9dbf4c9cd9f1e9a69f7152bba4832b734e7
 2017-02-16 01:59:13 +00:00
TreeHugger Robot
634733e42e Merge "Ensuring that there are per-user last stack active times." 2017-02-16 01:53:06 +00:00
Android Build Merger (Role)
9f1b5b73e8 Merge "Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev am: 38f1b6dbc9 am: c475730d22" 2017-02-16 01:37:06 +00:00
Rubin Xu
824b073fbe Merge "Add escrow token API in DevicePolicyManager." 2017-02-16 01:36:46 +00:00
Chris Tate
db70af4495 Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev am: 38f1b6dbc9 
am: c475730d22

Change-Id: I026c74906f8f43c2eb7ca529a59b1e6be5696351
 2017-02-16 01:36:18 +00:00
Soonil Nagarkar
760623a499 Merge "Use SystemConfig to control background location throttling whitelist." 2017-02-16 01:33:08 +00:00
Hall Liu
dbf6f9263d Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev 
am: 4d3435637f  -s ours

Change-Id: I2ed7250a9fb8c5026b209ad5b3384a401b1d4d16
 2017-02-16 01:31:54 +00:00
TreeHugger Robot
019b018cf7 Merge "Access IMMS#mSettings only inside the lock" 2017-02-16 01:29:54 +00:00
Chris Tate
c475730d22 Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev 
am: 38f1b6dbc9

Change-Id: I44d16150abee9dd0ec7961d1ce847d9793937354
 2017-02-16 01:25:04 +00:00
Hall Liu
4d3435637f Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev 2017-02-16 01:09:38 +00:00