Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
234,903 Commits 3 Branches 0 Tags
9daee8298bb23f52df1200583d2f6d5cbfbec0d2
Commit Graph

234903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
9daee8298b Import translations. DO NOT MERGE 
Change-Id: I84d35f9d88f70093a3bb48f54ea4df5a1b7e7cce
Auto-generated-cl: translation import
 2016-02-22 06:03:43 -08:00
Narayan Kamath
7bcf98a959 Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d." am: 0a1b294f68 am: fabbf9f78d 
am: 8f88f6ea64

* commit '8f88f6ea649e1c5a3eb994fb2c1763b474077ec4':
  Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d.
 2016-02-22 12:07:45 +00:00
Narayan Kamath
8f88f6ea64 Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d." am: 0a1b294f68 
am: fabbf9f78d

* commit 'fabbf9f78dc89475bec16b8d865402aa9c625b92':
  Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d.
 2016-02-22 12:03:15 +00:00
Neil Fuller
965cae4074 Merge "Add stubs needed to enable javac to compile lambdas" into nyc-dev am: fa272e5c92 
am: 1a5cf59f97

* commit '1a5cf59f97839aee1ca707efc22eef8f0494e02e':
  Add stubs needed to enable javac to compile lambdas
 2016-02-22 12:03:14 +00:00
Neil Fuller
1a5cf59f97 Merge "Add stubs needed to enable javac to compile lambdas" into nyc-dev 
am: fa272e5c92

* commit 'fa272e5c9262bc974d68139a6300ecdbf94f0767':
  Add stubs needed to enable javac to compile lambdas
 2016-02-22 11:59:13 +00:00
Neil Fuller
fa272e5c92 Merge "Add stubs needed to enable javac to compile lambdas" into nyc-dev 2016-02-22 11:55:30 +00:00
Narayan Kamath
fabbf9f78d Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d." 
am: 0a1b294f68

* commit '0a1b294f68355ed118d9c8b71e7688a698483378':
  Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d.
 2016-02-22 11:54:47 +00:00
Calin Juravle
206163507c Merge "Change the location of profile files." into nyc-dev am: 30eb5b30e7 
am: ef9c129887

* commit 'ef9c12988702a4915e7206b936bb7317fa3259b6':
  Change the location of profile files.
 2016-02-22 11:49:46 +00:00
Narayan Kamath
0a1b294f68 Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d." 2016-02-22 11:45:55 +00:00
Calin Juravle
ef9c129887 Merge "Change the location of profile files." into nyc-dev 
am: 30eb5b30e7

* commit '30eb5b30e7bf88fbd3397cb56cda854293ae9c4d':
  Change the location of profile files.
 2016-02-22 11:45:12 +00:00
Narayan Kamath
4b1e153716 Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d. 
bug: 27186457

Change-Id: I257eb422d6edcc1c52fc948995569fba6baf594f
 2016-02-22 11:44:10 +00:00
Calin Juravle
30eb5b30e7 Merge "Change the location of profile files." into nyc-dev 2016-02-22 11:42:02 +00:00
Polina Bondarenko
4f2d2d3b42 Merge "Added hardwareproperties SystemService" into nyc-dev am: 280c5b2155 
am: 5fc731e826

* commit '5fc731e82661aa31904e1473b651525256cc4f4a':
  Added hardwareproperties SystemService
 2016-02-22 09:36:32 +00:00
Polina Bondarenko
5fc731e826 Merge "Added hardwareproperties SystemService" into nyc-dev 
am: 280c5b2155

* commit '280c5b2155feae857ad514dff81adbfe73e398e9':
  Added hardwareproperties SystemService
 2016-02-22 09:32:37 +00:00
Polina Bondarenko
280c5b2155 Merge "Added hardwareproperties SystemService" into nyc-dev 2016-02-22 09:27:21 +00:00
Erik Kline
3926d347e6 Delete all NetworkUtils DHCP-related code. am: c3b52bc466 am: adc49e8fd5 
am: 80027c1f0b

* commit '80027c1f0b6a754b1a7cc5a6df918144cf979c78':
  Delete all NetworkUtils DHCP-related code.
 2016-02-22 09:24:12 +00:00
Erik Kline
80027c1f0b Delete all NetworkUtils DHCP-related code. am: c3b52bc466 
am: adc49e8fd5

* commit 'adc49e8fd59005a10df294d46c022563257eb942':
  Delete all NetworkUtils DHCP-related code.
 2016-02-22 09:19:51 +00:00
Erik Kline
adc49e8fd5 Delete all NetworkUtils DHCP-related code. 
am: c3b52bc466

* commit 'c3b52bc46604cb18d74fbe13dda15f4679222107':
  Delete all NetworkUtils DHCP-related code.
 2016-02-22 09:16:16 +00:00
Erik Kline
2acd2312c4 resolve merge conflicts of b242549166 to nyc-dev am: 0f6ae2ec0d 
am: aefa80254f

* commit 'aefa80254fa09f0040ba19c27e1752756c2081e1':
  Give bluetooth sufficient capabilities to run DhcpClient
 2016-02-22 07:19:43 +00:00
Erik Kline
aefa80254f resolve merge conflicts of b242549166 to nyc-dev 
am: 0f6ae2ec0d

* commit '0f6ae2ec0df270c4ce51c87896fe01fe6e1fedfa':
  Give bluetooth sufficient capabilities to run DhcpClient
 2016-02-22 07:16:01 +00:00
Erik Kline
0f6ae2ec0d resolve merge conflicts of b242549166 to nyc-dev 
Change-Id: I42d4cac95a209fdfae5769d75d90f004a94d60a4
 2016-02-22 15:42:07 +09:00
Erik Kline
c3b52bc466 Delete all NetworkUtils DHCP-related code. 
Bug: 26991160
Change-Id: I2c74e0161f43f65c1b6a85dc9f294b64c8f1ae6e
 2016-02-22 15:14:31 +09:00
Erik Kline
b242549166 Give bluetooth sufficient capabilities to run DhcpClient 
Specifically:
    CAP_NET_RAW
    CAP_NET_BIND_SERVICE

Bug: 26991160
Change-Id: I2afddc9efa3b613d974afb0ea33703948203d99a
 2016-02-22 15:14:31 +09:00
Erik Kline
d365999790 Add WaitForProvisioningCallback am: 111d55658b am: 13daed9fea 
am: 3697ed1fcd

* commit '3697ed1fcd441f712f19a291a99a9533558bad92':
  Add WaitForProvisioningCallback
 2016-02-22 04:36:30 +00:00
Erik Kline
3697ed1fcd Add WaitForProvisioningCallback am: 111d55658b 
am: 13daed9fea

* commit '13daed9fea65c45a7aaeff7224833a87a676a1b4':
  Add WaitForProvisioningCallback
 2016-02-22 04:33:10 +00:00
Erik Kline
13daed9fea Add WaitForProvisioningCallback 
am: 111d55658b

* commit '111d55658bce1bcc3eb61b4aeaa4d8a256165b02':
  Add WaitForProvisioningCallback
 2016-02-22 04:29:37 +00:00
Erik Kline
e4590d4f9f Support setting TCP buffer sizes and HTTP Proxy config am: d0e843b8ef am: 69ce6a0fc5 
am: 5d7293cca8

* commit '5d7293cca8b0b162a2eb293cc739d7aaa62ff85c':
  Support setting TCP buffer sizes and HTTP Proxy config
 2016-02-22 04:18:31 +00:00
Erik Kline
5d7293cca8 Support setting TCP buffer sizes and HTTP Proxy config am: d0e843b8ef 
am: 69ce6a0fc5

* commit '69ce6a0fc5fe7f4b7e0dfd929cc4f718354e9d6b':
  Support setting TCP buffer sizes and HTTP Proxy config
 2016-02-22 04:14:49 +00:00
Erik Kline
69ce6a0fc5 Support setting TCP buffer sizes and HTTP Proxy config 
am: d0e843b8ef

* commit 'd0e843b8ef4218ba8f69a8a53b3eeaf21e667deb':
  Support setting TCP buffer sizes and HTTP Proxy config
 2016-02-22 04:11:28 +00:00
Erik Kline
111d55658b Add WaitForProvisioningCallback 
This centralizes code that is shared by both bluetooth and ethernet
transport layers.

Bug: 26991160
Change-Id: I8e2dd8580c29c86394119768e3a5529850b4b859
 2016-02-22 13:02:02 +09:00
Erik Kline
d0e843b8ef Support setting TCP buffer sizes and HTTP Proxy config 
This allows IpManager to send callback recipients a more satisfying
LinkProperties.

Bug: 26991160
Change-Id: I2eb60dc633e5be38dad9410a1096d0095ddf57a0
 2016-02-22 12:50:44 +09:00
Donghyun Cho
53df72c2d2 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev am: f3db5743b9 
am: e53db46568

* commit 'e53db46568f2a7830e5fe1d8ddd69d8c0dfb89b7':
  MediaSession: Add new methods for preparing media content
 2016-02-22 03:46:43 +00:00
Donghyun Cho
e53db46568 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev 
am: f3db5743b9

* commit 'f3db5743b91e4b90c81a58c41670cca9000dc9e6':
  MediaSession: Add new methods for preparing media content
 2016-02-22 03:42:58 +00:00
Donghyun Cho
f3db5743b9 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev 2016-02-22 03:38:55 +00:00
Daichi Hirono
b0aafa5a51 Merge "Update object info when writing a file." into nyc-dev am: 073f5aaec7 
am: bb305c1bab

* commit 'bb305c1bab99306f92e95adefa36e22d92460f6f':
  Update object info when writing a file.
 2016-02-22 03:15:13 +00:00
Daichi Hirono
bb305c1bab Merge "Update object info when writing a file." into nyc-dev 
am: 073f5aaec7

* commit '073f5aaec7256a693dbe09489ddd433ea8267898':
  Update object info when writing a file.
 2016-02-22 03:11:26 +00:00
Daichi Hirono
073f5aaec7 Merge "Update object info when writing a file." into nyc-dev 2016-02-22 03:07:31 +00:00
Wale Ogunwale
6f23958544 Merge "Fixed bug with stack bounds getting out of alignment with screen rotation" into nyc-dev am: 25410b13a1 
am: b41d1963c4

* commit 'b41d1963c40bd39f7b7a3f4bde3b07c3416ca98e':
  Fixed bug with stack bounds getting out of alignment with screen rotation
 2016-02-21 23:06:07 +00:00
Wale Ogunwale
b41d1963c4 Merge "Fixed bug with stack bounds getting out of alignment with screen rotation" into nyc-dev 
am: 25410b13a1

* commit '25410b13a1204770f74465176907871aa09fed98':
  Fixed bug with stack bounds getting out of alignment with screen rotation
 2016-02-21 23:03:05 +00:00
Wale Ogunwale
25410b13a1 Merge "Fixed bug with stack bounds getting out of alignment with screen rotation" into nyc-dev 2016-02-21 22:59:10 +00:00
Wale Ogunwale
ecbcadd27d Fixed bug with stack bounds getting out of alignment with screen rotation 
Before updating the stack bounds due to rotation change, we need to make
sure both the configuration and the current display info. the stack is
using have been updated for the current rotation. Previously we were
updating is after configuration change, but the rotation might have changed
again by the time we get the configuraiton changed call and
TaskSack.updateDisplayInfo not called yet.

Bug: 26744649
Change-Id: Idfd30e78dc9c2fb521ff1957f043c3b1696a2a31
 2016-02-21 14:18:51 -08:00
Jason Monk
7cdea0389f Fix edit/page indicator area layout am: 855d408e17 
am: 353c8ceb04

* commit '353c8ceb042c1b8024fd1177311462c920ea0270':
  Fix edit/page indicator area layout
 2016-02-21 16:12:06 +00:00
Jason Monk
353c8ceb04 Fix edit/page indicator area layout 
am: 855d408e17

* commit '855d408e17612beadfc637496f50b03a7149515a':
  Fix edit/page indicator area layout
 2016-02-21 16:05:41 +00:00
Jason Monk
855d408e17 Fix edit/page indicator area layout 
Bug: 27201532
Change-Id: Ie03e6aeeb9d607f1fba370a4f1bd23a2ffb9b485
 2016-02-21 11:00:49 -05:00
Wale Ogunwale
f0f00c7ecb Apply minimal task dimension to all task bounds change. am: 9a08f827a4 
am: 04f70bd8a0

* commit '04f70bd8a05c478c051f8e8215807223ac8413cf':
  Apply minimal task dimension to all task bounds change.
 2016-02-20 22:48:20 +00:00
Wale Ogunwale
04f70bd8a0 Apply minimal task dimension to all task bounds change. 
am: 9a08f827a4

* commit '9a08f827a4f8ac333402e22e5d45228abe8d98fa':
  Apply minimal task dimension to all task bounds change.
 2016-02-20 22:42:40 +00:00
Wale Ogunwale
9a08f827a4 Apply minimal task dimension to all task bounds change. 
We only used to apply the minimal dimension on resizeTask in
ActivityStackSuperior which is mostly used for freeform and
missed resizes that went through other channels like resizeStack
which is used for split-screen.
We now apply it on TaskRecord.updateOverrideConfiguration which
all task bounds changes go through.

Bug: 27220870
Change-Id: I856948c371f5f5f144e61029ced4a467f7ebe33a
 2016-02-20 14:29:20 -08:00
Svet Ganov
057841000c No overlay when permissions shown - framework am: 9cea80cddd 
am: e552813050

* commit 'e5528130503b554d1e2cc6a711d50857c66a801c':
  No overlay when permissions shown - framework
 2016-02-20 18:45:18 +00:00
Jason Monk
278dafc535 Don\'t set the text on QS Tiles unless we need to am: 7435155432 
am: b619efd771

* commit 'b619efd771bdf3525bc75ab6518af081f2d0a625':
  Don't set the text on QS Tiles unless we need to
 2016-02-20 18:42:09 +00:00
Jason Monk
4317ecb8f0 Merge changes Icb8e2097,I9a2a16f9 into nyc-dev am: 865a4ee0cd 
am: 4472d715c7

* commit '4472d715c7307149e40e30370e57c3ca68beac5e':
  Optimization for TouchAnimator
  QS Animations - first pass, still not spec
 2016-02-20 18:41:03 +00:00