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

127595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaewan Kim
924b22d46b am ce245e1c: Merge "Refactor IpConfiguration from WifiConfiguration" 
* commit 'ce245e1c6546ef05a8645d2d54bfa3e2e4178046':
  Refactor IpConfiguration from WifiConfiguration
 2014-04-07 05:04:02 +00:00
Jaewan Kim
ce245e1c65 Merge "Refactor IpConfiguration from WifiConfiguration" 2014-04-07 04:40:45 +00:00
Jaewan Kim
1284767ceb Refactor IpConfiguration from WifiConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
 2014-04-07 11:35:35 +09:00
quddusc
6242fdd8c3 am e49ba1a3: am f403d60f: am 17878a9a: 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 'e49ba1a3fc6c915a4ec6c526ecb25afe2dbd7f32':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:50:00 +00:00
quddusc
e49ba1a3fc am f403d60f: am 17878a9a: 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 'f403d60fc8dfe2b833a65b6933a07c44d849e831':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:45:01 +00:00
quddusc
f403d60fc8 am 17878a9a: 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 '17878a9ab5c58f5b245bbdd0e8e16abbcde4a995':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:38:52 +00: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
d550c2d626 am 8bd72e50: am acf395fd: am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit '8bd72e50335d3a276ffa41928c791c8d50d5d028':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 17:11:51 +00:00
Etienne Le Grand
8bd72e5033 am acf395fd: am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit 'acf395fd9441bce9fbe68c1b7efbf824570284bc':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 17:05:38 +00:00
Etienne Le Grand
acf395fd94 am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit '819239e5bec90ee3c861ac45fffac4a832a183a1':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 09:05:50 +00:00
Etienne Le Grand
2f24dc436e am fa1d2417: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit 'fa1d2417d296e28a48a8c4a5cfb932172edbdd65':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 06:28:11 +00:00
Etienne Le Grand
fa1d2417d2 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
(cherry picked from commit 819239e5bec90ee3c861ac45fffac4a832a183a1)
 2014-04-05 06:14:24 +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
3bcc1d77df am ded26473: am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'ded264733036bb566c54da5b771d63f57213c84e':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 03:59:09 +00:00
Etienne Le Grand
ded2647330 am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'bdfe384106de364ea2effac6ab80108556d11649':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 03:53:49 +00:00
Etienne Le Grand
bdfe384106 am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 01:52:27 +00:00
Christopher Tate
c10e90ab48 am 706f50c3: Merge "Back up the preferred home app, if any" 
* commit '706f50c3abe0d899304313fd8631c35098d9866d':
  Back up the preferred home app, if any
 2014-04-05 01:30:24 +00:00
Christopher Tate
706f50c3ab Merge "Back up the preferred home app, if any" 2014-04-05 01:27:09 +00:00
Deepanshu Gupta
ce00b81c41 am 1cb3e814: Merge "Fix sdk build" 
* commit '1cb3e81421ada146b35515942299fb867b82048d':
  Fix sdk build
 2014-04-05 01:09:22 +00:00
Deepanshu Gupta
1cb3e81421 Merge "Fix sdk build" 2014-04-05 01:06:00 +00:00
Deepanshu Gupta
ddf286282d Fix sdk build 
Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
 2014-04-04 18:02:57 -07:00
Christopher Tate
a99d02170b Back up the preferred home app, if any 
If the user has stated a preference about their home app, make sure we
capture that so that a system restore can return them to that preferred
situation.  It's built into the system metadata so that we can, if
necessary, fast-path configuration of that home app while the rest of
the restore operation is in flight.

Change-Id: I64dfee8f7a2a9e40f556cd19298d7b367c6aa8dc
 2014-04-04 17:40:34 -07:00
Michael Wright
adde87a645 am 118d1134: Merge "Fix size_t format specifier" 
* commit '118d113478a2c58e7997f926a8dd1bc5ca5f5dc8':
  Fix size_t format specifier
 2014-04-04 23:55:46 +00:00
Michael Wright
118d113478 Merge "Fix size_t format specifier" 2014-04-04 23:51:36 +00:00
Nick Kralevich
f9d1c4d6d7 am 55e86a78: am 8e2a4b53: am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always." 
* commit '55e86a78a6656ef5a99f7b5df59c7eeedd34148a':
  Always call super.onCreate().  Always.
 2014-04-04 23:40:50 +00:00
Ruchi Kandoi
38915a1c4c am 654d75fe: PowerManager: Fix build 
* commit '654d75fec9e04306a3e08e4ef0c3aa0ec9ef96ea':
  PowerManager: Fix build
 2014-04-04 23:40:47 +00:00
Nick Kralevich
55e86a78a6 am 8e2a4b53: am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always." 
* commit '8e2a4b539509f03c4b3521574a910f2ea3296a66':
  Always call super.onCreate().  Always.
 2014-04-04 23:37:53 +00:00
Ruchi Kandoi
654d75fec9 PowerManager: Fix build 
fix build breaks by commit 667372e39bfe01bd15f0803d51ef0e9816f18808

Change-Id: I9e6e0f9146f860d27337cef0551c686ba2d60e23
 2014-04-04 16:34:56 -07:00
Nick Kralevich
8e2a4b5395 am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always." 
* commit '4ed27328b5e20d32b1e6ac5b39684dad3e737ca7':
  Always call super.onCreate().  Always.
 2014-04-04 23:31:44 +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
Nick Kralevich
4ed27328b5 am dc97144b: Merge "Always call super.onCreate(). Always." 
* commit 'dc97144b3f83bf6dae90493a6631afc6523dfce2':
  Always call super.onCreate().  Always.
 2014-04-04 23:25:52 +00:00
Nick Kralevich
dc97144b3f Merge "Always call super.onCreate(). Always." 2014-04-04 23:18:46 +00:00
Christopher Tate
5eab368c4d Always call super.onCreate(). Always. 
Bug 12991134

(cherrypick of commit 9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a)

Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
 2014-04-04 23:06:13 +00:00
Michael Wright
9ecba5269b Fix size_t format specifier 
Change-Id: I7d4ce5e0c7bb4d9e0cc19edf68f30f6b2b054bc7
 2014-04-04 15:29:53 -07:00
Katie McCormick
6527728999 am 6652b983: am de4fedef: am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit '6652b98339a7d1611d936ff8e725bb6dafe75f3d':
  Doc Update: notification bug fix.
 2014-04-04 21:47:19 +00:00
Katie McCormick
6652b98339 am de4fedef: am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'de4fedefbf4772e15bb9aa95458fd2f314cdb502':
  Doc Update: notification bug fix.
 2014-04-04 21:41:49 +00:00
Katie McCormick
de4fedefbf am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit '8e63696a73dfebae9b2ec123611db6b21968dbfd':
  Doc Update: notification bug fix.
 2014-04-04 21:35:50 +00: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
Leon Scroggins
c1b717fbb4 am 7716b7d8: Merge "Update to call new Skia APIs." 
* commit '7716b7d8ef9addb913bbc4bdd3153fa36bd1aa87':
  Update to call new Skia APIs.
 2014-04-04 20:35:38 +00:00
Leon Scroggins
7716b7d8ef Merge "Update to call new Skia APIs." 2014-04-04 20:31:00 +00:00
Ruchi Kandoi
b0c8593d97 am f20a5eb2: PowerManager: add powerHint method 
* commit 'f20a5eb279035d462e1f5d9895f4eb66cc152215':
  PowerManager: add powerHint method
 2014-04-04 20:29:39 +00:00
Ruchi Kandoi
f20a5eb279 PowerManager: add powerHint method 
Add powerHint method to IPowerManager for passing power hints from other
processes.

Change-Id: Ic596ace2ed1796a6da4cddb2163dcc4536115e55
 2014-04-04 20:24:16 +00:00
John Spurlock
83398922ba am 0a0454fd: am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:40:10 +00:00
Adam Powell
41923aedce am dd79334f: Merge "Fix ActionBar attribute parsing" 
* commit 'dd79334f7ecb39135058c2049cd933b4b930a3d1':
  Fix ActionBar attribute parsing
 2014-04-04 19:34:15 +00:00
John Spurlock
0a0454fdcc am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:34:11 +00:00