Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,649 Commits 3 Branches 0 Tags
8330bd519eaa5204bd79110caeebdeca953c7270
Commit Graph

193649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
8330bd519e am b0eb08b5: Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev 
* commit 'b0eb08b521d2b76531df3946cece002ed72fa363':
  Remove the 5 sec timeout logic for setVolumeControlStream
 2015-05-22 16:02:57 +00:00
Jean-Michel Trivi
b0eb08b521 Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev 2015-05-22 15:51:35 +00:00
Jason Monk
d78cdb1d3a am bf3d1af3: SettingsLib: Fix wifi crash during settings index 
* commit 'bf3d1af3d8bd32f410aa5cc44ccdc1df593ef210':
  SettingsLib: Fix wifi crash during settings index
 2015-05-22 15:38:52 +00:00
Jason Monk
bf3d1af3d8 SettingsLib: Fix wifi crash during settings index 
and test it

Bug: 21365029
Change-Id: I9a914773577dcbe591b41c9114ba4d078b5e7369
 2015-05-22 11:26:34 -04:00
Clara Bayarri
6b9f24caff am ae0940fe: Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev 
* commit 'ae0940fe754b7aba552b4a5cd616df052606ccd1':
  Update the PROCESS_TEXT action javadoc to include types
 2015-05-22 15:20:19 +00:00
Erik Kline
eb7e4048d3 am 2dcba49c: Merge "Notify only on loss of provisioning." into mnc-dev 
* commit '2dcba49caf114dd24ffc1c26a11683c5cb21e3ff':
  Notify only on loss of provisioning.
 2015-05-22 15:20:00 +00:00
Keisuke Kuroyanagi
3e7965f71c am 1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev 
* commit '1733bd3defde7818940d72dac95bb18fb8d70b22':
  Fix: Insertion handle can be moved just by tapping.
 2015-05-22 15:19:54 +00:00
Adam Lesinski
90b078d586 am 35f6c005: Merge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev 
* commit '35f6c005be3565d49da60ff4e5b267a541115745':
  BatteryStatsService: Only query bluetooth on demand.
 2015-05-22 15:19:47 +00:00
Jim Miller
c1ee7f454f am b0eec328: Merge "Fix type-o in fingerprint string messages." into mnc-dev 
* commit 'b0eec3288fc84fd5118be15004e46e27e5e584c1':
  Fix type-o in fingerprint string messages.
 2015-05-22 15:19:40 +00:00
Vinit Deshpande
94315b847c am 45261633: Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev 
* commit '4526163398e49713065d05be010d3233a281b05f':
  Indicate failed scans with EXTRA_RESULTS_UPDATED
 2015-05-22 15:19:34 +00:00
Griff Hazen
8ae2cc4191 am cf3591ad: (-s ours) am 99fd373c: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit 'cf3591ad60fac149fbe4d3e7e6335fdb9ea63eef':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
 2015-05-22 15:19:28 +00:00
Griff Hazen
cdbb5e4708 am c40cd40d: (-s ours) am 77420269: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE 
* commit 'c40cd40d90c54b20e490fb25596f0781601e5d6d':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
 2015-05-22 15:19:23 +00:00
Dirk Dougherty
a9e5a31fae am f4ba7833: am 0140854a: am 85dea528: Doc change: updated images, landings, and ndk updates. 
* commit 'f4ba7833af54ad6a75803dd678acac57c7f9e26b':
  Doc change: updated images, landings, and ndk updates.
 2015-05-22 15:19:17 +00:00
Luan Nguyen
0f1695394c am 67fe970e: am 82120b61: am 5c7dcb30: am 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples 
* commit '67fe970eaaa81b8fb4313ced7a05aac41bf25400':
  docs: Update the AlwaysOn sample link to point to DAC's samples
 2015-05-22 15:19:11 +00:00
Joe Fernandez
a57b282743 am b7361058: am 18cc51d6: am 23fcc39e: docs: M Preview downloads and SDK Setup pages v2 
* commit 'b73610589aa5b580d3e22cbe8816cc48063d30ab':
  docs: M Preview downloads and SDK Setup pages v2
 2015-05-22 15:19:05 +00:00
Luan Nguyen
957bfab1ed am 1c23c1cb: am d8573aa5: am dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs 
* commit '1c23c1cb40a2e9e54e8fe1b707e9f29f9b00ee54':
  docs: Refresh Wearable support library reference for Diamond
 2015-05-22 15:19:00 +00:00
Luan Nguyen
ba9c9cade2 am 63b426e0: am f644f702: am 6d592518: am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs 
* commit '63b426e0c3e559dd57adf64b09fcda899e79cfaa':
  docs: Remove references to Android Studio 0.8 beta
 2015-05-22 15:18:54 +00:00
Luan Nguyen
3b71db1681 am ca734e13: am 6a4d4a46: am 2801c77e: am 606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs 
* commit 'ca734e13c0048fb97f19c4a23b00c5ecf5558b00':
  docs: Add Always-On lesson for Wear apps
 2015-05-22 15:18:46 +00:00
Luan Nguyen
bc665eddd3 am d37e23df: am 0444253e: am 94587871: am 5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs 
* commit 'd37e23df30a58626116f2031061d0ea70ce65010':
  docs: Add always-on design for wearable activities
 2015-05-22 15:18:40 +00:00
Filip Gruszczynski
4bffa83d54 am c32b981c: am 479b1c77: am 037c9cac: Merge "Fix build." into cw-d-mr1-dev 
* commit 'c32b981c76807f00e62aeb2a1d748045c970458a':
  Fix build.
 2015-05-22 15:18:35 +00:00
Clara Bayarri
ae0940fe75 Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev 2015-05-22 10:24:57 +00:00
Erik Kline
2dcba49caf Merge "Notify only on loss of provisioning." into mnc-dev 2015-05-22 04:22:04 +00:00
Erik Kline
b1eebaeb92 Notify only on loss of provisioning. 
Lots of code refactoring, include:
    - no longer watch for on-link proxies (only routers and DNS servers)
    - keep track of NUD state of neighbors of interest

Bug: 18581716
Change-Id: Ia7dbef0690daf54f69ffecefc14e1224fd402397
 2015-05-22 13:03:08 +09:00
Keisuke Kuroyanagi
1733bd3def Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev 2015-05-22 02:28:26 +00:00
Adam Lesinski
35f6c005be Merge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev 2015-05-22 02:08:55 +00:00
Adam Lesinski
c14c273bf8 BatteryStatsService: Only query bluetooth on demand. 
Bluetooth was being queried too often, leading to more power
consumption and wakelock time.

Bug:21063567
Bug:21269307
Change-Id: Idddbab46d13016ef8528e095945b7817c12f7266
 2015-05-22 02:08:19 +00:00
Jim Miller
b0eec3288f Merge "Fix type-o in fingerprint string messages." into mnc-dev 2015-05-22 02:00:21 +00:00
Jim Miller
8701b5a0fa Fix type-o in fingerprint string messages. 
Fixes bug 19561423

Change-Id: I1f7d88884d551b6b1250455cf3ff9496adf34263
 2015-05-21 18:59:10 -07:00
Vinit Deshpande
4526163398 Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev 2015-05-22 01:58:38 +00:00
Filip Gruszczynski
adafcb4b62 am 97b3ae1a: Fix build. 
* commit '97b3ae1a8766616675ebf2323a97d8adfd41bfdc':
  Fix build.
 2015-05-22 01:54:39 +00:00
Jim Miller
8bd088f590 am 361b2d69: Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev 
* commit '361b2d69eef8cb19994a17fb317b7b84ea5b0b95':
  Fix crash in fingerprint and problem where directory has wrong selinux label
 2015-05-22 01:54:34 +00:00
Griff Hazen
cf3591ad60 am 99fd373c: (-s ours) am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 
* commit '99fd373cc66e0b4512b6b32c08c453501482a76e':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
 2015-05-22 01:50:57 +00:00
Griff Hazen
c40cd40d90 am 77420269: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE 
* commit '77420269fe36e693efd8e78d047a90c7d4fbb66b':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
 2015-05-22 01:50:45 +00:00
Dirk Dougherty
f4ba7833af am 0140854a: am 85dea528: Doc change: updated images, landings, and ndk updates. 
* commit '0140854a636ed7def204d769dbc4eb7857d009be':
  Doc change: updated images, landings, and ndk updates.
 2015-05-22 01:50:32 +00:00
Luan Nguyen
67fe970eaa am 82120b61: am 5c7dcb30: am 0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples 
* commit '82120b618045186f99c0c939934d1ecfc82c9caa':
  docs: Update the AlwaysOn sample link to point to DAC's samples
 2015-05-22 01:49:51 +00:00
Joe Fernandez
b73610589a am 18cc51d6: am 23fcc39e: docs: M Preview downloads and SDK Setup pages v2 
* commit '18cc51d6df88f59a442bf2194efd74e1f2e07347':
  docs: M Preview downloads and SDK Setup pages v2
 2015-05-22 01:49:43 +00:00
Luan Nguyen
1c23c1cb40 am d8573aa5: am dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs 
* commit 'd8573aa517922431dc1f50575c692b2bc1cb0307':
  docs: Refresh Wearable support library reference for Diamond
 2015-05-22 01:49:37 +00:00
Luan Nguyen
63b426e0c3 am f644f702: am 6d592518: am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs 
* commit 'f644f70208871d54729c74f74727e6083b27f569':
  docs: Remove references to Android Studio 0.8 beta
 2015-05-22 01:49:31 +00:00
Luan Nguyen
ca734e13c0 am 6a4d4a46: am 2801c77e: am 606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs 
* commit '6a4d4a46f24389f83c1d1a837d01c76a9effd6e6':
  docs: Add Always-On lesson for Wear apps
 2015-05-22 01:49:25 +00:00
Luan Nguyen
d37e23df30 am 0444253e: am 94587871: am 5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs 
* commit '0444253e6911af35db350cc6678dc2b2d020c68c':
  docs: Add always-on design for wearable activities
 2015-05-22 01:49:19 +00:00
Filip Gruszczynski
c32b981c76 am 479b1c77: am 037c9cac: Merge "Fix build." into cw-d-mr1-dev 
* commit '479b1c77ce7b033f7160614f5a0d7305d1268129':
  Fix build.
 2015-05-22 01:49:03 +00:00
Filip Gruszczynski
97b3ae1a87 Fix build. 
Cherry picking because automerger is stuck.

Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733
(cherry picked from commit c1b736a0cd)
 2015-05-22 01:42:32 +00:00
Jim Miller
361b2d69ee Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev 2015-05-22 01:42:25 +00:00
Dianne Hackborn
c60f010edc am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev 
* commit '8b20cdb27bc5b4c433c4fc650203be9a25842bbd':
  Add API to track usage time of apps.
 2015-05-22 01:25:25 +00:00
Jean-Michel Trivi
ccffda8359 Remove the 5 sec timeout logic for setVolumeControlStream 
Bug 16983918

Change-Id: I65174615d882ea433105862b1ecc50c512979ef9
 2015-05-21 18:23:57 -07:00
Dianne Hackborn
8b20cdb27b Merge "Add API to track usage time of apps." into mnc-dev 2015-05-22 01:12:44 +00:00
Selim Gurun
53d3e8c93d am 95821eea: Merge "Clean remaining API related issues." into mnc-dev 
* commit '95821eeabc1d6ae07ed2c3e6763f17473fb32ae3':
  Clean remaining API related issues.
 2015-05-22 01:12:03 +00:00
Selim Gurun
95821eeabc Merge "Clean remaining API related issues." into mnc-dev 2015-05-22 01:02:14 +00:00
Selim Gurun
98fe09cba0 Clean remaining API related issues. 
Bug:21063767
Change-Id: Ifb6936699367b4cc1641b74c890856c0b51978d2
 2015-05-21 17:56:58 -07:00
Jim Miller
16ef71f4f5 Fix crash in fingerprint and problem where directory has wrong selinux label 
Fixes bug 21373942

Change-Id: I860656b0c9e26c038d03d9872c490466dc62d4e7
 2015-05-21 17:48:59 -07:00