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

217602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
63e6aa8571 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 
am: ccfcb636ae

* commit 'ccfcb636ae0c99b974f3cbe3177322c41e33bb15':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:23:47 +00:00
Deepanshu Gupta
ce400cd75e Merge "WindowDecorActionBar name change fix." into mnc-ub-dev 
am: 62302bd72a

* commit '62302bd72aaa6b0f934257447e8dcd636799180e':
  WindowDecorActionBar name change fix.
 2015-11-17 01:17:27 +00:00
Sanket Padawe
ccfcb636ae Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev 
am: abea6dc466

* commit 'abea6dc466cbd01be261192f8dbc083b58661bad':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:12:48 +00:00
Deepanshu Gupta
62302bd72a Merge "WindowDecorActionBar name change fix." into mnc-ub-dev 2015-11-17 01:11:10 +00:00
Sanket Padawe
abea6dc466 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev 2015-11-17 01:07:28 +00:00
Michael Kwan
6881185307 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours 
am: f23229f45f  -s ours

* commit 'f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-16 23:57:50 +00:00
Michael Kwan
f23229f45f DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. 
am: 8d6630b87c  -s ours

* commit '8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-16 23:48:39 +00:00
Deepanshu Gupta
2b0551175d WindowDecorActionBar name change fix. 
In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536,
WindowDecorActionBar's package name was changed. This breaks layoutlib.
Fix the issue by checking both package names when loading the class.

Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
 2015-11-16 15:46:12 -08:00
Michael Kwan
8d6630b87c DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. 
Android currently forces USB into MTP mode if there was no modes
specified. This causes issues on Clockwork devices as they do not
support MTP.

The hack stops this behaviour, and also sets MTP mode back to none.

Bug: 25547826
Bug: 25582050
Bug: 25244201
Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
 2015-11-16 14:05:29 -08:00
Chad Brubaker
fd0d31a3f4 Add NetworkSecurityConfigProvider.install 
This method is not currently called.

Change-Id: I73fd166b03009526868e0d9b5b209a9adaa4232f
 2015-11-16 12:49:36 -08:00
Eino-Ville Talvala
f5b98ee1dc Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c 
am: 784f0f15a9

* commit '784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
  Camera: Minor documentation update
 2015-11-16 20:35:51 +00:00
Alex Klyubin
00245ffce4 Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e 
am: 5995579f5f

* commit '5995579f5ff1511f4a089dd0537cd634fb615465':
  Insert Android Keystore JCA Provider at the correct position.
 2015-11-16 20:31:36 +00:00
Eino-Ville Talvala
784f0f15a9 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 
am: 062c629e5c

* commit '062c629e5c6270da232bbd2800966ab5dc6c615f':
  Camera: Minor documentation update
 2015-11-16 20:27:03 +00:00
Alex Klyubin
5995579f5f Merge "Insert Android Keystore JCA Provider at the correct position." 
am: 887d348d7e

* commit '887d348d7ed5e1c2a1687eb774db46d571a8f43d':
  Insert Android Keystore JCA Provider at the correct position.
 2015-11-16 20:22:51 +00:00
Eino-Ville Talvala
062c629e5c Camera: Minor documentation update am: 0b6e1bfae8 
am: 0691d16759

* commit '0691d16759bf58a93209d4ab156e96f96fed7092':
  Camera: Minor documentation update
 2015-11-16 20:16:45 +00:00
Alex Klyubin
887d348d7e Merge "Insert Android Keystore JCA Provider at the correct position." 2015-11-16 20:14:43 +00:00
Eino-Ville Talvala
0691d16759 Camera: Minor documentation update 
am: 0b6e1bfae8

* commit '0b6e1bfae848b7b177bba9c8119ad44cdc05684a':
  Camera: Minor documentation update
 2015-11-16 20:07:02 +00:00
Erik Wolsheimer
2fba776ee0 Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 
am: b45defae8e

* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 19:03:53 +00:00
Erik Wolsheimer
b45defae8e Log errno when dup fd cannot be allocated BUG: 25165471 
am: 211abad3b9

* commit '211abad3b92b70dd094949c79f67e686c940fa0c':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 18:55:29 +00:00
Erik Wolsheimer
211abad3b9 Log errno when dup fd cannot be allocated 
BUG: 25165471

Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
 2015-11-16 10:29:20 -08:00
Alex Klyubin
8e028e6507 Insert Android Keystore JCA Provider at the correct position. 
Security.insertProviderAt uses 1-based positions whereas the
AndroidKeyStoreProvider.install code was incorrectly passing in
0-based positions, thus installing the AndroidKeyStoreBCWorkaround
provider one level higher than intended. This change fixes the issue
in AndroidKeyStoreProvider.

Bug: 25399691
Change-Id: I4a66bf37c0d151edb9a2349db9d91939064c0574
 2015-11-16 10:11:50 -08:00
Bryce Lee
0db53d90a0 Add Bluetooth headset API to allow disabling audio route. 
This functionality is required by devices which have multiple profiles
using the SCO channel. For example, a device that is both a HFP AG and HF.
In this case, we must explicitly notify the profiles when they can acquire
the channel as they are not aware of each other. A similar change was
previously added to the Bluetooth Headset Client profile.

Bug: 25485578
Change-Id: Ia60cfdd33c2c3c3f185464b24056f8ccb976056d
 2015-11-16 08:55:52 -08:00
Mark Salyzyn
45f88d02de Merge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3 
am: c53dad8d16

* commit 'c53dad8d16c552d06ac4acb8ddbd937bda2d26d7':
  Revert "jni: is loggable speedup, not within signal"
 2015-11-16 16:42:51 +00:00
Mark Salyzyn
c53dad8d16 Merge "Revert "jni: is loggable speedup, not within signal"" 
am: 3c54ed00f3

* commit '3c54ed00f390e0ce9c555eb517594628b362705f':
  Revert "jni: is loggable speedup, not within signal"
 2015-11-16 16:35:58 +00:00
Mark Salyzyn
3c54ed00f3 Merge "Revert "jni: is loggable speedup, not within signal"" 2015-11-16 16:30:57 +00:00
Mark Salyzyn
421d434818 Revert "jni: is loggable speedup, not within signal" 
This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.

Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
 2015-11-16 16:26:44 +00:00
Geoff Mendal
c94a189e5f Import translations. DO NOT MERGE am: 83d65fea01 -s ours 
am: a6c50551cd  -s ours

* commit 'a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
  Import translations. DO NOT MERGE
 2015-11-16 13:54:52 +00:00
Geoff Mendal
a6c50551cd Import translations. DO NOT MERGE 
am: 83d65fea01  -s ours

* commit '83d65fea01c4233c80161acdd69b64fa559c3749':
  Import translations. DO NOT MERGE
 2015-11-16 13:38:58 +00:00
Geoff Mendal
83d65fea01 Import translations. DO NOT MERGE 
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
 2015-11-16 14:18:40 +01:00
Calin Juravle
c3a70ce001 Merge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d 
am: e20120031f

* commit 'e20120031fd573c3beef4892f6917ba1553db6a8':
  Remove obsolete profile handling from AndroidRuntime.
 2015-11-16 11:35:56 +00:00
Calin Juravle
e20120031f Merge "Remove obsolete profile handling from AndroidRuntime." 
am: 360e95a90d

* commit '360e95a90dab2c2522aa3ba13c6b2a3df737e626':
  Remove obsolete profile handling from AndroidRuntime.
 2015-11-16 11:20:55 +00:00
Calin Juravle
360e95a90d Merge "Remove obsolete profile handling from AndroidRuntime." 2015-11-16 11:08:06 +00:00
Eino-Ville Talvala
0b6e1bfae8 Camera: Minor documentation update 
- Further clarify hardware.camera feature being only for the back camera

Bug: 24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
 2015-11-13 15:25:45 -08:00
Michael Wright
333db2e122 DO NOT MERGE. Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
 2015-11-13 21:53:14 +00:00
Michael Wright
84669ca8de DO NOT MERGE. Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
 2015-11-13 21:52:18 +00:00
Yang Ni
89baba188e Merge "Various fixes in setting globals in a script group" am: c011ffd842 
am: 7ee861abae

* commit '7ee861abaeac214a889d8f4113db41970599793b':
  Various fixes in setting globals in a script group
 2015-11-13 21:26:15 +00:00
Yang Ni
7ee861abae Merge "Various fixes in setting globals in a script group" 
am: c011ffd842

* commit 'c011ffd84296700df4c28b9fc9fa84da9081de41':
  Various fixes in setting globals in a script group
 2015-11-13 21:17:33 +00:00
Yang Ni
c011ffd842 Merge "Various fixes in setting globals in a script group" 2015-11-13 21:11:25 +00:00
Winson Chung
d2b3d8bff1 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef 
am: 20ba5c919b

* commit '20ba5c919bb97bb922919a34b3a081ea26b25000':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:51:18 +00:00
Winson Chung
20ba5c919b Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 
am: 28fc76ecef

* commit '28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:44:29 +00:00
Winson Chung
da131290ae Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec 
am: ef15ca85d7

* commit 'ef15ca85d7f847884e391e3283daabb019e44e10':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:37:16 +00:00
Winson Chung
28fc76ecef Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec 
am: ef15ca85d7

* commit 'ef15ca85d7f847884e391e3283daabb019e44e10':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:37:15 +00:00
Winson Chung
ef5feb290a Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2 
am: 3bab0fd4f7

* commit '3bab0fd4f7b848d45ce94b96abbdc537d1e47a5a':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:29:35 +00:00
Winson Chung
ef15ca85d7 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours 
am: d45a18c8ec

* commit 'd45a18c8eca074f8c83a64ed465021a61becb49a':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:29:33 +00:00
Winson Chung
d45a18c8ec Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 
am: 32265b9ea0  -s ours

* commit '32265b9ea000b04ac62f3c114edb063246260401':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:21:55 +00:00
Winson Chung
3bab0fd4f7 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 
am: 1b29fd87a2

* commit '1b29fd87a26d6230c55c701d1411b34342614af0':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:21:53 +00:00
Winson Chung
32265b9ea0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 
am: b133b984a0

* commit 'b133b984a0644a78270d51007123e75ded24eb14':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:30 +00:00
Winson Chung
fed6ffd87a Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d 
am: 3e9f2b7894

* commit '3e9f2b789414f34b5530107c362295c5a637bac1':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:29 +00:00
Winson Chung
1b29fd87a2 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d 
am: 3e9f2b7894

* commit '3e9f2b789414f34b5530107c362295c5a637bac1':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:15:29 +00:00
Winson Chung
b133b984a0 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 
am: bb4da4efc3

* commit 'bb4da4efc320caee77f11bb316145b8e5f264e07':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:08:38 +00:00