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

214440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martijn Coenen
21ab24f5c7 Merge "Improve NFC-F transceive() docs." 
am: 1f4f7190a8

* commit '1f4f7190a8fe6bd87fd9dd198cb711cb1a540354':
  Improve NFC-F transceive() docs.
 2016-02-05 09:44:28 +00:00
Martijn Coenen
1f4f7190a8 Merge "Improve NFC-F transceive() docs." 2016-02-05 09:38:16 +00:00
Martijn Coenen
6711e02033 Improve NFC-F transceive() docs. 
It wrongly said the SoD included the length;
put a sample frame in the docs to help devs.

Change-Id: I8ea74f37e7335f3e05f7df81fc303bf6195ac3cc
 2016-02-05 10:26:16 +01:00
Amith Yamasani
510a2c5aeb Merge "Transit to correct state after alarm is fired" 
am: f3c432059c

* commit 'f3c432059c44e8e74b0385adde5f619e4d8eba0d':
  Transit to correct state after alarm is fired
 2016-02-04 22:00:38 +00:00
Amith Yamasani
f3c432059c Merge "Transit to correct state after alarm is fired" 2016-02-04 21:52:54 +00:00
Wei Liu
0218fc7dbb Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev am: e2c27eede5 -s ours am: 44b73f54fb -s ours 
am: 3db7909c7a  -s ours

* commit '3db7909c7a2b827a9c887ae8a00360cb75001c8b':
  DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.
 2016-02-04 18:41:11 +00:00
Wei Liu
3db7909c7a Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev am: e2c27eede5 -s ours 
am: 44b73f54fb  -s ours

* commit '44b73f54fb223538eb05fe7b86ff0f47c117be7e':
  DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.
 2016-02-04 18:35:22 +00:00
Wei Liu
44b73f54fb Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev 
am: e2c27eede5  -s ours

* commit 'e2c27eede562241423c02d086703b12d4b3dddd3':
  DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.
 2016-02-04 18:28:10 +00:00
Wei Liu
e2c27eede5 Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev 2016-02-04 18:23:59 +00:00
Wei Liu
7007254630 Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev am: fbd88d132e -s ours am: 4577aac551 -s ours 
am: 1886efacfc  -s ours

* commit '1886efacfc22aff9e191cd57820c2d151bac66e3':
  DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.
 2016-02-04 18:15:26 +00:00
Wei Liu
1886efacfc Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev am: fbd88d132e -s ours 
am: 4577aac551  -s ours

* commit '4577aac5510db6c3255a5e09a573c52bbfa8b609':
  DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.
 2016-02-04 18:10:16 +00:00
Wei Liu
4577aac551 Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev 
am: fbd88d132e  -s ours

* commit 'fbd88d132e3d75c9f1af607fc1ba00a6596d7406':
  DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.
 2016-02-04 18:05:34 +00:00
Wei Liu
fbd88d132e Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev 2016-02-04 18:01:45 +00:00
Koji Fukui
27b33306e6 Transit to correct state after alarm is fired 
Symptom:
When AlarmClock fires in IDLE, state is changed to ACTIVE.
But the ACTIVE state continues under some conditions.

Root cause:
Transition from IDLE state to ACTIVE state when AlarmClock fires
1.	Send ACTION_STEP_IDLE_STATE intent
2.	Calles onReceive() in BroadcastReceiver
3.	Calles stepIdleStateLocked()
4.	Calles becomeActiveLocked()　

Check point (1) to change from ACTIVE state to INACTIVE
(Display On -> Off)
1.	onDisplayChanged()
2.	updateDisplayLocked()
3.	becomeInactiveIfAppropriateLocked()

Check point (2) to change from ACTIVE state to INACTIVE
(charging -> not charging)
1.	ACTION_BATTERY_CHANGED
2.	updateChargingLocked()
3.	becomeInactiveIfAppropriateLocked()

There are only two check points to change from ACTIVE to INACTIVE.
If state transition, from IDLE to ACTIVE,
happened by AlarmClock when display is off and not charging,
ACTIVE state will be kept and never changes to INACTIVE state.

Change-Id: I93398366307f529b9c0074ac58b19ad6e4695790
 2016-02-04 10:56:24 +09:00
Wei Liu
c47749f990 DO NOT MERGE ANYWHERE Put the start of RttService behind a flag. 
We can set config.disable_rtt in the init script to disable the
RttService.

b/26877020

Change-Id: Ifb7fedc4764329dc09cae41f06bf6d5fc7426e5f
 2016-02-03 17:01:55 -08:00
Wei Liu
aae35640cd DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT. 
b/26877020

Change-Id: Idfef31edb7e67ae60c1b2205df326ed1c5657618
 2016-02-03 16:37:45 -08:00
Andre Eisenbach
7cbc1aeecd Merge "Implementation of BluetoothDevice.createBondOutOfBand" 
am: 026a58476b

* commit '026a58476ba219bcc08608c2e6156683c9158d5d':
  Implementation of BluetoothDevice.createBondOutOfBand
 2016-02-04 00:35:32 +00:00
Andre Eisenbach
026a58476b Merge "Implementation of BluetoothDevice.createBondOutOfBand" 2016-02-04 00:25:34 +00:00
Jakub Pawlowski
c28caad44b Implementation of BluetoothDevice.createBondOutOfBand 
This patch implements out of band pairing that uses optional data.
Currently, it works only for LE transport, using Temporary Key value.
In the future fields might be added to OOBData to support other options for
optional data.

Change-Id: I0811182efb72ac5f80521ed4876b32603cb628c1
 2016-02-03 16:12:47 -08:00
Eric Laurent
d24eb54b54 Merge "Bluetooth: Restrict gain for Absolute volume case" 
am: 81e7a58754

* commit '81e7a5875465f9b2b7ed785d4f138b11f386c5c1':
  Bluetooth: Restrict gain for Absolute volume case
 2016-02-03 18:02:20 +00:00
Eric Laurent
81e7a58754 Merge "Bluetooth: Restrict gain for Absolute volume case" 2016-02-03 17:30:39 +00:00
Geoff Mendal
f322b46028 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 8152fbd7e9  -s ours

* commit '8152fbd7e999fe57f85944a12b281be47fec0a79':
  Import translations. DO NOT MERGE
 2016-02-03 16:40:38 +00:00
Geoff Mendal
04364c7464 Import translations. DO NOT MERGE am: a3144a52c6 -s ours 
am: 1a0c0953a0  -s ours

* commit '1a0c0953a0ffebe876e9abcf63d2c3e8e2d12a6f':
  Import translations. DO NOT MERGE
 2016-02-03 15:54:07 +00:00
Geoff Mendal
8152fbd7e9 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-02-03 15:44:40 +00:00
Geoff Mendal
d6a791fc1f Import translations. DO NOT MERGE 
Change-Id: I801233d391712c477e3b38b912465333b483a78b
Auto-generated-cl: translation import
 2016-02-03 10:42:52 -05:00
Geoff Mendal
1a0c0953a0 Import translations. DO NOT MERGE 
am: a3144a52c6  -s ours

* commit 'a3144a52c63a8f69f0f79fe05070fd181bc70b1d':
  Import translations. DO NOT MERGE
 2016-02-03 15:24:32 +00:00
Geoff Mendal
a3144a52c6 Import translations. DO NOT MERGE 
Change-Id: I3f9c8af09874bbdb5473ffb49a49f21c2d3bc12a
Auto-generated-cl: translation import
 2016-02-03 09:57:33 -05:00
Geoff Mendal
04defe7b2f Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: d3f6510b6f  -s ours

* commit 'd3f6510b6ff8e91ddd3450804460bc91f67676cf':
  Import translations. DO NOT MERGE
 2016-02-03 11:45:43 +00:00
Geoff Mendal
f445067f52 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 7c5cf65b83  -s ours

* commit '7c5cf65b83b84c236c0e156c100c2af3b9300c08':
  Import translations. DO NOT MERGE
 2016-02-03 11:37:19 +00:00
Geoff Mendal
acbdeaba70 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: e8f321c778  -s ours

* commit 'e8f321c7788a6ee717e43600ff095bf608c92946':
  Import translations. DO NOT MERGE
 2016-02-03 11:28:31 +00:00
Geoff Mendal
b73c44bbcc Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 091a828fb5  -s ours

* commit '091a828fb5220d367124bd72a3e2c020e8200feb':
  Import translations. DO NOT MERGE
 2016-02-03 11:17:26 +00:00
Geoff Mendal
02171a04a6 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: f47a2c9fb9  -s ours

* commit 'f47a2c9fb9bfe9bc09e1df96f246f681683bd38a':
  Import translations. DO NOT MERGE
 2016-02-03 11:13:58 +00:00
Geoff Mendal
77ceede11b Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 762829795f  -s ours

* commit '762829795f52c701f244550ec142fbd35a631a28':
  Import translations. DO NOT MERGE
 2016-02-03 11:09:58 +00:00
Geoff Mendal
e7dccbd97c Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: fd92981842  -s ours

* commit 'fd92981842c774a23fce4384deb03bb655d0c6f8':
  Import translations. DO NOT MERGE
 2016-02-03 11:05:42 +00:00
Geoff Mendal
892160a1c5 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 45267b2f06  -s ours

* commit '45267b2f068fda88741ec5f9d949b6b19d232ed3':
  Import translations. DO NOT MERGE
 2016-02-03 11:02:40 +00:00
Geoff Mendal
0ba5990d99 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 38f33925f8  -s ours

* commit '38f33925f87a0d705e4b0f3c2959978368a9c0b6':
  Import translations. DO NOT MERGE
 2016-02-03 11:00:03 +00:00
Geoff Mendal
f80ebaf32e Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: e6faf1a713  -s ours

* commit 'e6faf1a713edb64b7dfe1128604fceccfc448101':
  Import translations. DO NOT MERGE
 2016-02-03 10:56:37 +00:00
Geoff Mendal
4b4d63c3a5 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: fba9bae4d1  -s ours

* commit 'fba9bae4d15757f6655a82a96cfaf2f2c77fe729':
  Import translations. DO NOT MERGE
 2016-02-03 10:54:05 +00:00
Geoff Mendal
87c4199600 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 6779c7d415  -s ours

* commit '6779c7d41583a01ca304543979d3d5a90af5cc57':
  Import translations. DO NOT MERGE
 2016-02-03 10:49:28 +00:00
Geoff Mendal
4c3e6f2a53 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93 -s ours 
am: 768b07ca66  -s ours

* commit '768b07ca66e9a0780e17d3d8542b601e2ffc2771':
  Import translations. DO NOT MERGE
 2016-02-03 10:46:00 +00:00
Geoff Mendal
3350974f82 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5 -s ours 
am: b1be124b15  -s ours

* commit 'b1be124b15a0ad24ef6262917a127474677c445c':
  Import translations. DO NOT MERGE
 2016-02-03 10:43:24 +00:00
Geoff Mendal
b8758b39a9 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8 -s ours 
am: a0159dfc08  -s ours

* commit 'a0159dfc081a8c000163f604868a868e55c50c45':
  Import translations. DO NOT MERGE
 2016-02-03 10:40:41 +00:00
Geoff Mendal
d5668a4a88 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5 -s ours 
am: a85507482f  -s ours

* commit 'a85507482f1c1b4e03061d7a677f8f4b157f6f4a':
  Import translations. DO NOT MERGE
 2016-02-03 10:38:09 +00:00
Geoff Mendal
a6f5fe64f4 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c -s ours 
am: 4d79bcf457  -s ours

* commit '4d79bcf457141b91417ae2033ab6b3313665ca8d':
  Import translations. DO NOT MERGE
 2016-02-03 10:37:05 +00:00
Geoff Mendal
b8783e5933 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3 -s ours 
am: aa7e0396c9  -s ours

* commit 'aa7e0396c9bc23180bb856ae92081bd4e6b0da71':
  Import translations. DO NOT MERGE
 2016-02-03 10:36:01 +00:00
Geoff Mendal
3cddac44fd Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a -s ours 
am: 0291cf7113  -s ours

* commit '0291cf7113023c58a02110e8a4f7e191d37510ca':
  Import translations. DO NOT MERGE
 2016-02-03 10:35:02 +00:00
Geoff Mendal
6332ec3317 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 21e0a012d8 -s ours 
am: 008f7facbe  -s ours

* commit '008f7facbed95e67cf45ff81013b83e7f44c54aa':
  Import translations. DO NOT MERGE
 2016-02-03 10:33:55 +00:00
Geoff Mendal
381c7ce4ed Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb -s ours 
am: abaebda3ff  -s ours

* commit 'abaebda3ff388c6e0c78558ddf00c29801318af6':
  Import translations. DO NOT MERGE
 2016-02-03 10:32:50 +00:00
Geoff Mendal
e521419909 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9561ec3353 -s ours 
am: 6dfc27dac9  -s ours

* commit '6dfc27dac9eadfa86c811cbbff0e08887d81769d':
  Import translations. DO NOT MERGE
 2016-02-03 10:31:45 +00:00
Geoff Mendal
84f4b8a84a Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 6f63adbe93 -s ours 
am: 79d8d1a13f  -s ours

* commit '79d8d1a13f719edb5238972ab6123643cf911146':
  Import translations. DO NOT MERGE
 2016-02-03 10:30:38 +00:00