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

202207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe LaPenna
f6ca46d301 Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE" 
This reverts commit 88c7c3e08051f4a2be8ee5194214678a07ff7f01.

Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG: 23753686
 2015-11-17 02:42:10 +00:00
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
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
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
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
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
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
211abad3b9 Log errno when dup fd cannot be allocated 
BUG: 25165471

Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
 2015-11-16 10:29:20 -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
Geoff Mendal
83d65fea01 Import translations. DO NOT MERGE 
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
 2015-11-16 14:18:40 +01: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
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
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
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
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
Winson Chung
3e9f2b7894 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev 
am: dce0f8040d

* commit 'dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 2015-11-13 18:08:35 +00:00
Winson Chung
dce0f8040d Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev 2015-11-13 18:02:47 +00:00
Winson Chung
bb4da4efc3 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 2015-11-13 18:02:38 +00:00
Filip Gruszczynski
fe482e0bca Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev 2015-11-13 17:15:14 +00:00
Wale Ogunwale
4ff84631af Initialize DisplayContent base info when object is constructed 
It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.

Bug: 22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
 2015-11-12 20:46:07 -08:00
Shreyas Basarge
d80d24f5b1 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:41:55 +00:00
Shreyas Basarge
c4a9c319e5 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b 
am: c9eb8b4367

* commit 'c9eb8b436715ba9b59382759cf0dcf991ed33594':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:35:51 +00:00
Shreyas Basarge
c9eb8b4367 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d 
am: 64bdb9f06b

* commit '64bdb9f06b7fc3e497088243a966dec95d1936e1':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:29:47 +00:00
Shreyas Basarge
64bdb9f06b Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e 
am: 359ee7f47d

* commit '359ee7f47de2eee82951abed294e4db44405973c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:40 +00:00
Matthew Williams
ffffcf14c5 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c 
am: 69ee300c90

* commit '69ee300c90288fba6c3f81a37fd347892009e42e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:37 +00:00
Shreyas Basarge
359ee7f47d Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 
am: bf29f10c1e

* commit 'bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:16:24 +00:00
Matthew Williams
69ee300c90 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc 
am: af5c9f809c

* commit 'af5c9f809cf7bbb890036a6411504a92e0d507ca':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:16:19 +00:00
Shreyas Basarge
bf29f10c1e Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af 
am: 44368e6dd4

* commit '44368e6dd4ec56e9eca47b1e81d307f672bb3006':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:09:36 +00:00
Matthew Williams
af5c9f809c Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 
am: c455148edc

* commit 'c455148edce05b4862df8853a78276fb5f28151a':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:09:35 +00:00
Shreyas Basarge
44368e6dd4 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 
am: f5f03a19af

* commit 'f5f03a19affc6775ac3e44a3540351e132fffc0e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Matthew Williams
c455148edc Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f 
am: 6d13650c74

* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Shreyas Basarge
f5f03a19af Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 
am: cc7c1d3812

* commit 'cc7c1d381249edfd906cb57afbd8589e6c345141':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:34 +00:00
Matthew Williams
6d13650c74 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 
am: a0d20db02f

* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:30 +00:00
Matthew Williams
a0d20db02f Sync extras bundle comparison can throw NPE am: c0f39c1ece 
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:11 +00:00
Shreyas Basarge
cc7c1d3812 Sync extras bundle comparison can throw NPE am: 2f137b7705 
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:02 +00:00
Matthew Williams
34b700a7c2 Sync extras bundle comparison can throw NPE 
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Shreyas Basarge
294611faa8 Sync extras bundle comparison can throw NPE 
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Kevin Neas
0972c26243 DO NOT MERGE. Cherrypick UiBench from Master 
UiBench apk for Jank tests for Emerald

Change-Id: Ib58a2b8ff76b18b9c41cbd513c8a16571b7a37a0
 2015-11-13 01:09:58 +00:00
Sanket Padawe
4f822bbf2a Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev 
am: 5b6ad87630

* commit '5b6ad87630756751471f7224672328d955c8f2fb':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-12 23:58:48 +00:00
Sanket Padawe
ccbe7383e6 Don't allow contact sharing by default for device not recognized as carkit. 
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.

Bug: 23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
(cherry picked from commit 07533dbffff5551ad4c58852b5856f57d7da6801)
 2015-11-12 23:53:42 +00:00
Sanket Padawe
5b6ad87630 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev 2015-11-12 23:53:25 +00:00
Joe LaPenna
516ac154e1 Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev 2015-11-12 23:08:48 +00:00
Joe LaPenna
6915d809e8 Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev 2015-11-12 23:08:42 +00:00
Shreyas Basarge
2f137b7705 Sync extras bundle comparison can throw NPE 
Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
 2015-11-12 15:32:44 +00:00
Amith Yamasani
481a343d32 DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files 
Bug: 25355086
Change-Id: I65946e5afa841215f161fc25ad70b31a108a33c3
(Cherrypicked from ccf7d9e8ce11fd44e5b70b375ce25bed93e7153c)
 2015-11-11 17:39:37 -08:00
Mark Lu
7018f60b06 DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events. 
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100

RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.

Solution:
Let display listener executed in background thread handler

BUG: 25355086

Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
(Cherrypicked from 4e59db328d8b0cc163d2e3eb0f7f3a108f20a58d)
 2015-11-11 17:39:24 -08:00