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

201062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Dan Stoza
904f485bc6 SurfaceControl: Add colorTransform to DisplayInfo 
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.

Bug: 20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
 2015-09-03 13:38:39 -07:00
Adrian Roos
bd2ad550c5 am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev 
* commit '34411e8fecab310a0402bd77e8fe5a5a488a783a':
  Don't disable fingerprint when entering wrong credential
 2015-09-03 19:46:45 +00:00
Adrian Roos
54ceea195b am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 
* commit '95200e6f4eb34818ac0b652167cffacfcfb4fdff':
  Poke fingerprint timeout when vold password is correct
 2015-09-03 19:46:41 +00:00
Adrian Roos
34411e8fec Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev 2015-09-03 19:42:39 +00:00
Adrian Roos
95200e6f4e Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 2015-09-03 19:41:22 +00:00
Adrian Roos
af4ab3e2d3 Don't disable fingerprint when entering wrong credential 
Bug: 23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
 2015-09-03 12:34:12 -07:00
Adrian Roos
f6d51acec6 Poke fingerprint timeout when vold password is correct 
Bug: 23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
 2015-09-03 12:34:11 -07:00
Adrian Roos
b90f1de216 am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 
* commit '1b5cc3a4ba46029b798adb9e362d87df5673bc52':
  Show face unlock even when fingerprint is running
 2015-09-03 19:08:53 +00:00
Adrian Roos
1b5cc3a4ba Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 2015-09-03 18:59:37 +00:00
Ian Pedowitz
cb92577aa6 am 7d223aee: am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev 
* commit '7d223aeef8c9108210e0d13e9458b4d701781ee0':
  Don't crash on (invalid) hardware address lengths > 127.
 2015-09-03 18:14:49 +00:00
Svetoslav Ganov
a5cd5d8756 am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev 
* commit '0b5162c85f01f8451120e7ad82aa7193850862f7':
  Don't drop runtime permissions on older system app update.
 2015-09-03 18:14:17 +00:00
Wale Ogunwale
1942f8a72d am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 
* commit 'd4ef34ce8d9cfb351e1a063ce2ff354ee0b9c13b':
  Respect DONT_KILL_APP flag when bringing down a disabled service.
 2015-09-03 18:14:13 +00:00
Ian Pedowitz
7d223aeef8 am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev 
* commit '0a76afb93e6f303921ab84e2f26747c3ebf19b62':
  Don't crash on (invalid) hardware address lengths > 127.
 2015-09-03 17:34:50 +00:00
Ian Pedowitz
0a76afb93e Merge "Don't crash on (invalid) hardware address lengths > 127." into mnc-dev 2015-09-03 17:22:21 +00:00
Svetoslav Ganov
0b5162c85f am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev 
* commit '6dd856b1ea31bae083b6c2ed40af812c41b3a6cf':
  Don't drop runtime permissions on older system app update.
 2015-09-03 17:17:46 +00:00
Wale Ogunwale
d4ef34ce8d am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 
* commit '512141d581133ad5c1712ac097dcee08d46bae2c':
  Respect DONT_KILL_APP flag when bringing down a disabled service.
 2015-09-03 17:17:42 +00:00
Svetoslav Ganov
6dd856b1ea Merge "Don't drop runtime permissions on older system app update." into mnc-dev 2015-09-03 17:08:57 +00:00
Wale Ogunwale
512141d581 Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 2015-09-03 17:06:03 +00:00
Michael Wright
59c1a0e1cb am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 
* commit '8ae90587a510f72a176119b1f23add8bc36285b9':
  Add TabletModeChangedListener for SystemUI.
 2015-09-03 14:10:05 +00:00
Michael Wright
8ae90587a5 Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 2015-09-03 14:00:52 +00:00
Lorenzo Colitti
d64144a37c Don't crash on (invalid) hardware address lengths > 127. 
These would cause us to crash with a NegativeArraySizeException
when trying to create the clientMac array. Instead, if the length
is > 16 (invalid, because the field is only 16 bytes long), fudge
it to 6 (Ethernet / wifi).  This is a bit less liberal than the
legacy client, which doesn't check the length at all.

Bug: 23725795
Change-Id: I83f47bfc400ffa8ce85dd9d1b8eb96be5afe51a5
 2015-09-03 21:28:48 +09:00
Adrian Roos
e07cbaf53c Show face unlock even when fingerprint is running 
Bug: 23318158
Change-Id: I02b085297c2546c814d97d725d18beba79568b33
 2015-09-02 16:26:34 -07:00