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

123567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
f7871c3146 am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation." 
* commit 'b9b31f4b8eda123e7b544d1a0fa886576064adca':
  Support an ABI flag for instrumentation.
 2014-05-30 10:49:00 +00:00
Narayan Kamath
b9b31f4b8e am bd4d3203: Merge "Support an ABI flag for instrumentation." 
* commit 'bd4d320344833ce67dad3a4e10a61d0502a81d0e':
  Support an ABI flag for instrumentation.
 2014-05-30 10:41:24 +00:00
Narayan Kamath
bd4d320344 Merge "Support an ABI flag for instrumentation." 2014-05-30 10:35:29 +00:00
Jeff Brown
92ab0b91cd am aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-dev 
* commit 'aeb4e071abb100d10c39d154b05c2911d399395d':
  Add dumpsys to dock observer.
 2014-05-30 01:01:17 +00:00
Jeff Brown
aeb4e071ab Merge "Add dumpsys to dock observer." into klp-modular-dev 2014-05-30 00:58:54 +00:00
Jeff Brown
010e561a70 Add dumpsys to dock observer. 
Minor refactoring of dock observer to allow its state to be
inspected and modified via dumpsys for debugging purposes.

eg. View current state.
adb shell dumpsys DockObserver

eg. Simulate being docked.
adb shell dumpsys DockObserver set state 1

eg. Reset back to normal.
adb shell dumpsys DockObserver reset

Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
 2014-05-29 17:48:33 -07:00
Scott Main
0082933a0d am d897fb53: am e16e367f: am 5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp- 
* commit 'd897fb533317655a96aa6b38240a85b2093c90e4':
  change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
 2014-05-29 22:59:54 +00:00
Scott Main
d897fb5333 am e16e367f: am 5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs 
* commit 'e16e367f778b9c3dbdb87ed8ea293f12db97514a':
  change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
 2014-05-29 22:54:03 +00:00
Scott Main
e16e367f77 am 5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs 
* commit '5ca630e85541b97245d114162772abc4ffd77e97':
  change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
 2014-05-29 22:42:14 +00:00
Scott Main
5ca630e855 Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs 2014-05-29 22:33:24 +00:00
Wink Saville
5d3c96168d am 52b41462: am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '52b4146273ea29f6d1ed89e4de79f2d7ff0d71dc':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 09:56:24 +00:00
Griff Hazen
cc212d35aa am 339f437d: Additional doc fixes for WearableExtender 
* commit '339f437dc3f7c474d9cf1f963819bab2596e6ad3':
  Additional doc fixes for WearableExtender
 2014-05-29 06:34:01 +00:00
Wink Saville
52b4146273 am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '9cd3ff7d61ed65e8b815155747e7bbfc99c1e861':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 04:57:25 +00:00
Wink Saville
9cd3ff7d61 Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 2014-05-29 04:53:52 +00:00
Zhang Wei-e7976c
fb61bfa447 Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change. 
Change-Id: Ibe9e68295661f2f2ffaca3057d696df6a1db3f0c
 2014-05-29 04:43:19 +00:00
Brian Carlstrom
77b170cedc resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp 
Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
 2014-05-28 16:10:53 -07:00
Brian Carlstrom
452c592191 am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit '197565e0e800be3c731e679914f40afa1aab98fd':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 22:31:39 +00:00
Brian Carlstrom
197565e0e8 Merge "Move to dalvik.vm.lib.2 to force default to libart" 2014-05-28 22:28:39 +00:00
Brian Carlstrom
5bc93866b0 Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175

(cherry-picked from commit 2ef5abb8d534f016582d6023054cbe69d8114b6b)

Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
 2014-05-28 14:53:40 -07:00
Elliott Hughes
a487fb77df am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 
* commit 'df0e9ed5536e2cab860f3ecf9dab0030a471766e':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.
 2014-05-28 21:48:46 +00:00
Elliott Hughes
df0e9ed553 am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 
* commit '862be91276ec9532b3ed00d43fc7a750f1e6adb0':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.
 2014-05-28 21:41:30 +00:00
Elliott Hughes
862be91276 Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 2014-05-28 21:36:33 +00:00
Brigid Smith
461ac24b8c Updated Trace.h to recognize ATRACE_TAG_BIONIC. 
Bug: 15116468
Change-Id: I6aef941c6b6bd59347855f7265e701a3aaa08edc
 2014-05-28 14:21:06 -07:00
Griff Hazen
339f437dc3 Additional doc fixes for WearableExtender 
Change-Id: I3764e4d97c0007b905ff0f3eb553234668fd50e1
 2014-05-28 09:13:05 -07:00
Narayan Kamath
f4e0bf9fe1 am 98993813: am b75b3aaa: Merge "Build PacProcessor for 64 bit." 
* commit '98993813b31f20c27f2c0a91daebdaedc382bb5b':
  Build PacProcessor for 64 bit.
 2014-05-28 09:23:21 +00:00
Narayan Kamath
98993813b3 am b75b3aaa: Merge "Build PacProcessor for 64 bit." 
* commit 'b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7':
  Build PacProcessor for 64 bit.
 2014-05-28 08:48:23 +00:00
Narayan Kamath
b75b3aaac4 Merge "Build PacProcessor for 64 bit." 2014-05-28 08:44:36 +00:00
Griff Hazen
c15d315aeb am a9cb1e66: Add full screen size preset to WearableExtender 
* commit 'a9cb1e66737f816d643bca03832af719cbdd0f20':
  Add full screen size preset to WearableExtender
 2014-05-28 00:18:03 +00:00
Griff Hazen
be5898b198 am 6f72ac5d: Doc fixes for Notification.WearableExtender 
* commit '6f72ac5d5f4b7bae34bb3dab7821f3dbcbf02bcd':
  Doc fixes for Notification.WearableExtender
 2014-05-27 22:44:28 +00:00
Griff Hazen
a9cb1e6673 Add full screen size preset to WearableExtender 
For custom display notifications.

Bug: 14838838
Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
 2014-05-27 15:40:09 -07:00
Griff Hazen
6f72ac5d5f Doc fixes for Notification.WearableExtender 
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
 2014-05-27 11:28:45 -07:00
Etienne Le Grand
7326defe2d am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 
* commit 'd7439d8c59e4c5a82ad94a5080436cc94f72e0be':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
 2014-05-27 18:06:13 +00:00
Etienne Le Grand
d7439d8c59 Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 2014-05-27 18:03:13 +00:00
Craig Mautner
754a8c4c95 am 1b4bf857: Do not start tasks on ActivityViews unless explicit 
* commit '1b4bf857d34dc58a4ef84f5f0761bb7685051fbb':
  Do not start tasks on ActivityViews unless explicit
 2014-05-27 16:22:39 +00:00
Craig Mautner
1b4bf857d3 Do not start tasks on ActivityViews unless explicit 
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c
 2014-05-27 09:19:28 -07:00
Narayan Kamath
96132a1907 Build PacProcessor for 64 bit. 
external/chromium-libpac can now build for 64 bit.

Change-Id: I0bfd068ef4ea7d57686f11b79c32803e38bab719
 2014-05-27 17:06:18 +01:00
Narayan Kamath
eae7b53d3a am 34c6cb4c: am 6b5beb31: Merge "PacProccesor: Only build for 32-bit" 
* commit '34c6cb4c1af7a7dd8f8658dd401c74076943ffb8':
  PacProccesor: Only build for 32-bit
 2014-05-27 11:06:03 +00:00
Narayan Kamath
34c6cb4c1a am 6b5beb31: Merge "PacProccesor: Only build for 32-bit" 
* commit '6b5beb318b439b0b3aeabf42401bfed63bfbe2e2':
  PacProccesor: Only build for 32-bit
 2014-05-27 11:00:48 +00:00
Narayan Kamath
6b5beb318b Merge "PacProccesor: Only build for 32-bit" 2014-05-27 10:57:20 +00:00
Andreas Gampe
4694175624 PacProccesor: Only build for 32-bit 
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.

(cherry picked from commit f8749200c06a8714ffd46f5e2ec81be57ad4f7f4)

Change-Id: Ic128e17b7437c130df29eeab3293b9c01f01d70b
 2014-05-27 11:56:22 +01:00
Etienne Le Grand
af80510e85 Add confidence to the heart rate monitor definition and clarify onAccuracyChange 
Change-Id: I686d07dcd603bf3c3be3c1471de8be3b4e240855
 2014-05-23 19:14:33 -07:00
Scott Main
c138c82207 am e5c9c92c: am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit 'e5c9c92c23196269ccf50024f76f84779b821c32':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:57:57 +00:00
Scott Main
e5c9c92c23 am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit 'a4c95869ed2727ecc471e218b204657b7eaf8b5c':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:52:43 +00:00
Scott Main
a4c95869ed am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit '1f1bb9d06830552269c68bf3bd1e7184f1a7bb9d':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:49:15 +00:00
Scott Main
1f1bb9d068 Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 2014-05-23 21:45:33 +00:00
Eric Laurent
5231cb4bfb am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" 
* commit 'b928b7c2bf12a5dbd31b08d244b0ff8d2a9851c1':
  AudioService: fix cross deadlock in VolumeStreamState
 2014-05-23 21:41:47 +00:00
Eric Laurent
b928b7c2bf am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" 
* commit 'ba64d298bee228b8e27ea17fb31fbff4b4188304':
  AudioService: fix cross deadlock in VolumeStreamState
 2014-05-23 21:37:54 +00:00
Eric Laurent
ba64d298be Merge "AudioService: fix cross deadlock in VolumeStreamState" 2014-05-23 21:34:25 +00:00
Eric Laurent
fdbee869be AudioService: fix cross deadlock in VolumeStreamState 
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.

Bug: 13730145.

Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
 2014-05-23 21:32:06 +00:00
Griff Hazen
1e5746c682 am 00389a46: Fix build: CheckBuild line for removed wearable package 
* commit '00389a46ea6c9d1a9557fe648ffec64aaf5e95e0':
  Fix build: CheckBuild line for removed wearable package
 2014-05-23 08:37:01 +00:00