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

201186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cheryl Potter
4b32b3f43f Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs 2015-09-08 21:28:06 +00:00
xin He
2248874b8b am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev 
* commit 'ee1babecd204def48feb1fcf648dbed5cd760697':
  Introduce config_wifi_revert_country_code_on_cellular_loss
 2015-09-08 21:09:13 +00:00
xin He
ee1babecd2 Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev 2015-09-08 21:01:49 +00:00
Jorim Jaggi
10352f7a48 am 5e8e1c63: Do not expand notifications with expand gesture when disallowed 
* commit '5e8e1c63774da8c013fad18a63eac691cdc9646f':
  Do not expand notifications with expand gesture when disallowed
 2015-09-08 20:50:53 +00:00
Jorim Jaggi
5e8e1c6377 Do not expand notifications with expand gesture when disallowed 
Bug: 23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
 2015-09-08 18:51:00 +00:00
Cheryl Potter
a63d058b0a docs: change intro and title for contacts and sign-in lesson, and remove empty bullet 
b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
 2015-09-08 10:49:59 -07:00
Lorenzo Colitti
b988466312 Require the new PACKET_KEEPALIVE_OFFLOAD permission. 
Bug: 23884210
Change-Id: I50a1a647a69deaba92e73021ee7d6cc0f3eb1eee
 2015-09-09 00:16:57 +09:00
Lorenzo Colitti
9d1284eba7 Add an error code for generic hardware error. 
This is necessary because currently the wifi code just returns
whatever hardware-specific integer it gets back from the HAL,
which is bad because that will be interpreted by the caller as
one of the error codes defined in this class.

In parallel we'll also modify the wifi code to return this new
error code if the hardware returns an error.

Bug: 21405946
Change-Id: Ic9fa1193ced69a4e7ff543e397221c89b10a5a13
 2015-09-09 00:16:57 +09:00
Lorenzo Colitti
9acca09527 Fix bugs and crashes in PacketKeepalive API. 
Bug: 22606153
Bug: 23820819
Bug: 23884210
Change-Id: I1bf82094ec664baed345e9fb137fada0cbf4b7a0
 2015-09-09 00:16:56 +09:00
Lorenzo Colitti
7914ce5dd4 Add tests for the PacketKeepalive API. 
This currently fails in many different ways, but it tells us what
to fix.

Bug: 22606153
Bug: 23884210
Change-Id: If2e5ee0a8d7b26cad67d3d566ed5b1383e0db096
 2015-09-09 00:16:56 +09:00
Lorenzo Colitti
7b70036abc Add a PACKET_KEEPALIVE_OFFLOAD permission. 
Bug: 23884210
Change-Id: I0f9207ac9b9c07c676f64f2748905e523e891501
 2015-09-09 00:16:55 +09:00
Lorenzo Colitti
ffa390b6f3 Use a CountDownLatch instead of sleep() in NetworkFactory tests. 
This makes testNetworkFactoryRequests 2-3 times faster.

Bug: 22606153
Change-Id: I9657b6929e77f23ec811d0ab57b2ba974f0b6a69
 2015-09-08 16:41:47 +09:00
Lorenzo Colitti
e58961aa5f Get rid of shortSleep() in ConnectivityServiceTest. 
Instead, use IdleHandler to wait for things to become idle.

Bug: 22606153
Change-Id: Ic6ab93ad4d336b40962f9be1096629a44b63ee2f
 2015-09-08 16:41:47 +09:00
Nick Armstrong-Crews
56ecfcce6c Handle KEYCODE_SOFT_SLEEP from Ungaze. 
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: Iddafdde923605d119075e890eeda5d3fd3fd2bc7
 2015-09-07 21:46:50 -07:00
Nick Armstrong-Crews
9b8f82a3a0 Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev 2015-09-08 04:28:07 +00:00
Nick Armstrong-Crews
b331bf9514 Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze." 
This reverts commit 677adf1e66ba83b8fb2c849c181303b35bd489bc.

Hiding new keycode to prevent change to public API before resubmitting.

Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8
 2015-09-08 04:25:01 +00:00
Geoff Mendal
024fb4d4b8 am 9f3e169c: (-s ours) Import translations. DO NOT MERGE 
* commit '9f3e169c3a6277187fe00abc2eaa08d5872160ef':
  Import translations. DO NOT MERGE
 2015-09-07 15:38:18 +00:00
Geoff Mendal
9f3e169c3a Import translations. DO NOT MERGE 
Change-Id: Ifcce22af4c5736023ed78b34be3a420ec6c6738d
Auto-generated-cl: translation import
 2015-09-07 08:31:05 -07:00
Lorenzo Colitti
83fa2588f6 Make ConnectivityServiceTest a bit more readable. 
1. Make TestNetworkCallback a bit smarter and rename it to
   SingleUseNetworkCallback. This allows us to get rid of all the
   calls to TestNetworkCallback#getConditionVariable.
2. Delete the commented out code that used to test a
   ConnectivityService model that has not been used since KK.
3. Remove unused imports, etc.

Bug: 22606153
Change-Id: I81a2d0b970d19e5f4515490d8c2f88d416445fa1
 2015-09-07 20:41:51 +09:00
Martijn Coenen
a1ec958829 Fix missing copyright headers. 
Bug: 23868522
Change-Id: I37fb86e3a751fad363d70687d1b9bcd512bcd33e
 2015-09-07 11:53:59 +02:00
Cheryl Potter
dd9c75f331 am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '24a6be463e5628416ad234a3e2e33f1f4cc5b287':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:50:51 +00:00
Renato Mangini
18b68b2650 am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit '8f2a5b257603971405ce94a57d26dc26233b20db':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:50:47 +00:00
Cheryl Potter
24a6be463e am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '36866dc7347ba37ced74af6f8a6298c62282dacb':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:45:57 +00:00
Renato Mangini
8f2a5b2576 am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit '1edd4ebce50a653f3d1454114f5cd73edcace903':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:45:53 +00:00
Cheryl Potter
36866dc734 am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '4afcda743d0ba14ee0d3449e7f15518f3cc538dc':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:35:43 +00:00
Renato Mangini
1edd4ebce5 am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit 'a8b9a2b7aeab97f71ff876319d807d9f151c6065':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:35:36 +00:00
Cheryl Potter
4afcda743d am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 
* commit '79ad6310ea3ca5931013cf746babf55cf391cc8f':
  docs: changed references to Google+ sign-in to Google sign-in
 2015-09-04 22:24:55 +00:00
Renato Mangini
a8b9a2b7ae am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. 
* commit '81e0dff0da637f3580ac81e86950b23e9a55bbdc':
  Minor fix on Auto Desktop Head Unit doc.
 2015-09-04 22:24:48 +00:00
Cheryl Potter
79ad6310ea Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 2015-09-04 22:14:25 +00:00
Vinit Deshpande
6247701895 Introduce config_wifi_revert_country_code_on_cellular_loss 
This setting allows wifi country code to automatically reset
to default (i.e. ro.boot.wificountrycode property value) when
cellular modem loses MCC

bug: 21795172

Change-Id: I20bd3a260b639dba331305c6baa39ffb52e2fd6f
 2015-09-04 15:10:47 -07:00
Robert Greenwalt
e686d9b3aa am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev 
* commit '8e285f2f74460b1b4bc9ba0faa3c94540f5ab92c':
  Cut down some logs.
 2015-09-04 22:06:00 +00:00
Robert Greenwalt
8e285f2f74 Merge "Cut down some logs." into mnc-dr-dev 2015-09-04 21:51:50 +00:00
Joe LaPenna
ebff4c1d90 Merge "Do not wtf when the systemui is not present." into cw-e-dev 2015-09-04 21:01:12 +00:00
Tyler Gunn
eb5fcb900c Add carrier config for specifying invalid characters. 
Some carriers have the need to strip out certain invalid characters in
instant lettering (e.g. call subject) messages.
This carrier config is added for that purpose.

Bug: 22779583
Change-Id: I165dc125e6d40a0a85442ff138a77d286eb83a4c
 2015-09-04 13:16:37 -07:00
Joe LaPenna
acddf2b349 Do not wtf when the systemui is not present. 
Not all devices, like wearables actually have a system ui.

BUG: 23822226

Change-Id: Ibc2d6c3b8db1de668b9cbced3efcec5a7a39f20b
 2015-09-04 12:53:51 -07:00
Nick Armstrong-Crews
6f0ba40224 Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 2015-09-04 18:04:12 +00:00
Nick Armstrong-Crews
677adf1e66 Handle KEYCODE_SOFT_SLEEP from Ungaze. 
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: I24a96bd6db8ff28674c907f2898e49c4f6140209
 2015-09-04 10:20:22 -07:00
Pavel Zhamaitsiak
fb611846f6 am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev 
* commit '566886f7973b86196174e925f16d26975c16a09b':
  IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
 2015-09-04 16:20:11 +00:00
Pavel Zhamaitsiak
566886f797 Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev 2015-09-04 16:09:02 +00:00
Sungmin Choi
46b7e9e95d am 4c97f3a4: Do not show roaming icon for some operators of Chile 
* commit '4c97f3a45a3ba345d630e282c07c5126128514eb':
  Do not show roaming icon for some operators of Chile
 2015-09-04 16:08:04 +00:00
Sungmin Choi
4c97f3a45a Do not show roaming icon for some operators of Chile 
Bug: 23775352
Change-Id: Ie86c628e4acb8fe4b4d24feec98f5a9227c9346c
 2015-09-04 01:03:03 -07:00
Robert Greenwalt
a9ebeeff03 Cut down some logs. 
bug:23623327
Change-Id: I737d4e6c384bf4da62c65ad2abe0c9b5dca0067a
 2015-09-03 17:53:42 -07:00
Andre Eisenbach
1b03cd8e1b am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 
* commit '1d5e2e291d4c3fbcde1425af74644a24c94e1577':
  Bluetooth: Fix profile auto-connect logic
 2015-09-04 00:12:33 +00:00
Andre Eisenbach
1d5e2e291d Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 2015-09-04 00:02:57 +00:00
Andre Eisenbach
7be83c578c Bluetooth: Fix profile auto-connect logic 
The fix in commit 05e08c3a2f27d5027b34e81b7c0a67e4da7341f6 caused a
duplicate connect message to be sent to A2DP devices (and others),
causing the A2DP state machine to disconnect a device shortly after
connecting it.

This patch reverts the relevant part of commit 05e06c that causes the
faulty auto-connect behaviour.

Bug: 22128169
Change-Id: Ie0dadd5c9583bf2b64a8434a2a3603cb749b21d0
 2015-09-03 15:20:09 -07:00
Dan Stoza
f615872cb4 am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 
* commit '0b887e579b766012c09626e7089a3fade5415ee6':
  SurfaceControl: Add colorTransform to DisplayInfo
 2015-09-03 22:03:08 +00:00
Dan Stoza
0b887e579b Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 2015-09-03 21:55:36 +00:00
Amit Mahajan
2f142ab077 am 8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev 
* commit '8a670f1da434c4720b08dbb62c635316e593b9b3':
  Add TDSCDMA family
  Telephony: Add TD-SCDMA SignalStrength
 2015-09-03 21:39:52 +00:00
Amit Mahajan
8a670f1da4 Merge changes from topic 'TDSCDMA support' into mnc-dr-dev 
* changes:
  Add TDSCDMA family
  Telephony: Add TD-SCDMA SignalStrength
 2015-09-03 21:24:46 +00:00
Sharvil Nanavati
16db410182 Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev 2015-09-03 21:02:43 +00:00