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

120481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andre Eisenbach
cc68cc962d LE: Return false if an attribute read/write is in progress 
bug:12109128
Change-Id: I0155fcddc850aba47a1bf3e174d4ee582d50b187
 2014-04-09 10:59:44 -07:00
Baligh Uddin
f7d65ae852 Import translations. DO NOT MERGE 
Change-Id: I974afb393ebd8cf341012d3c08cad60b578cda30
Auto-generated-cl: translation import
 2014-04-09 09:53:03 -07:00
Jeff Brown
7289f3ab8f Merge "Move certain internal activity manager methods to new class." into klp-modular-dev 2014-04-09 04:36:51 +00:00
Jeff Brown
ea72cdf22f Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev 2014-04-09 04:33:27 +00:00
Jeff Brown
13014b5fe5 Move certain internal activity manager methods to new class. 
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.

Deleted the startRunning method since it is no longer useful.

Bug: 13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
 2014-04-08 20:51:07 -07:00
Jeff Brown
ad9ef191f5 Move display power controller to display manager service. (DO NOT MERGE) 
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
 2014-04-08 20:41:46 -07:00
Dave Platt
8e5df442cd Merge "NsdService does not clean up after exiting clients" 2014-04-08 17:35:57 -07:00
Adam Hampson
bd6c5577ab Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev 2014-04-08 15:51:23 +00:00
Baligh Uddin
0cf836a778 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-08 02:16:36 +00:00
Narayan Kamath
c74221594d DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime. 
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

(cherry picked from commit b3802a8e2360aaa0a88faa625e15c31b56eaf125)

Bug: 13763685
Bug: 13763900

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
 2014-04-07 16:45:05 -07:00
Adam Hampson
ce802f4898 Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 2014-04-07 21:27:53 +00:00
Robert Greenwalt
0468e3c7fa am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:46:58 +00:00
Robert Greenwalt
e1d4847c12 am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '331fa429cad1f464f0375a3466ba528b03c6e90d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:41:00 +00:00
Robert Greenwalt
cb163c684d am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:37:38 +00:00
Robert Greenwalt
331fa429ca am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:34:49 +00:00
Robert Greenwalt
c855a28a51 am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '5f3c0630e488bbcee687933b6350370a42354dc4':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:31:45 +00:00
Robert Greenwalt
a3d3e8c4f9 am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '463eeb70938403bdca2519d9b71911aab93b9277':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:27:50 +00:00
Robert Greenwalt
5f3c0630e4 am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '522bd7fb3468bc07133c7ff1a02033dcced740b9':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:26:35 +00:00
Robert Greenwalt
463eeb7093 am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:21:52 +00:00
Robert Greenwalt
522bd7fb34 am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '24444abff4ad45b731d4f6cd92afed79568773d8':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:18:41 +00:00
Robert Greenwalt
2676e36ff6 am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '3e604b1198fcab0e3bf2fd29043e4172193db2b5':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:16:15 +00:00
Robert Greenwalt
24444abff4 am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:12:56 +00:00
Robert Greenwalt
3e604b1198 am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '2c90609c0bddb6fbe255e5632a1e6639e760290f':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:09:33 +00:00
Robert Greenwalt
53691e39dc am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '128e937108035b77537f279dc0bc85a116906819':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:07:10 +00:00
Robert Greenwalt
2c90609c0b am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '339cfdbde333984d02d189249f46e7b13317baed':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:03:55 +00:00
Robert Greenwalt
128e937108 am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:00:33 +00:00
Robert Greenwalt
339cfdbde3 am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:57:32 +00:00
Robert Greenwalt
106627e07c am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'e42ce676f54742f2d47c26adaa90407c2cb8cec8':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:54:13 +00:00
Robert Greenwalt
72f9b3084c am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:51:34 +00:00
Robert Greenwalt
e42ce676f5 am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:48:39 +00:00
Robert Greenwalt
4bc58bd255 am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:47:49 +00:00
Robert Greenwalt
c0d94e7ac6 am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:42:49 +00:00
Robert Greenwalt
ebf23a8d9e am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:42:32 +00:00
Robert Greenwalt
f52d1a56af am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:54 +00:00
Robert Greenwalt
74acf23a1e am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:44 +00:00
Robert Greenwalt
3c417fbf21 Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 2014-04-07 19:30:10 +00:00
Baligh Uddin
c4a80acf9c Import translations. DO NOT MERGE 
Change-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693
Auto-generated-cl: translation import
 2014-04-07 09:16:57 -07:00
quddusc
17878a9ab5 am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'b430ec756473330f47bda2d8f0c266b3398169c9':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:32:35 +00:00
quddusc
b430ec7564 am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit '7db3875cdca4c94cb667d2d0cc86718f15e3305c':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:27:25 +00:00
quddusc
7db3875cdc Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 2014-04-05 22:23:36 +00:00
Etienne Le Grand
819239e5be Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
 2014-04-05 04:47:14 +00:00
Etienne Le Grand
fd53d8352a Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
 2014-04-04 16:31:08 -07:00
Narayan Kamath
5a7468f598 DO NOT MERGE Fix several bad function definitions. 
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271

(cherry picked from 047b938f7188c21c07669108c5c68b2358f6b158)

Change-Id: I6ce506131780d7cdeb05df9a7b8322f5494eeab2
 2014-04-04 15:01:06 -07:00
Katie McCormick
8e63696a73 am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'f7bffe7707f31da920a8ff08d013934562e9a43d':
  Doc Update: notification bug fix.
 2014-04-04 21:31:28 +00:00
Katie McCormick
f7bffe7707 am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'fc8ea92df15689d51079212d7d012756ce9298d2':
  Doc Update: notification bug fix.
 2014-04-04 21:17:29 +00:00
Katie McCormick
fc8ea92df1 Merge "Doc Update: notification bug fix." into klp-docs 2014-04-04 21:12:16 +00:00
Katie McCormick
507c9fd016 Doc Update: notification bug fix. 
Fixes:

b/13429906

Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
 2014-04-04 14:07:35 -07:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Ricardo Cervera
d10b654315 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '5df825237afd016c48dd3577d839825e5161d3e7':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:42:44 +00:00