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

166651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
8a5bb15efa Fix automerge issue 
Duplicate method declaration.

Change-Id: I9355bd7c716e668ad7892fd12e93352455d149b5
 2014-11-03 20:35:54 -08:00
Adam Lesinski
b2808c03c3 Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp 2014-11-04 03:37:50 +00:00
Dongwon Kang
89ff872654 am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b 
* commit 'e2e7e9df8b8db998d9d2cb2e43eae84df3edad64':
  TIF: Fix a typo and remove an unused method in TvInputService
 2014-11-04 03:16:30 +00:00
Eric Laurent
12f6a11de6 am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f 
* commit '8e264a7703c79fff52dedcd867b9f134d93199f6':
  AudioService: fix cross deadlock
 2014-11-04 03:16:23 +00:00
David Friedman
f2764dd421 am 5880c9c2: am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs automerge: 6666f34 
* commit '5880c9c269b21799683bd153d10b605c9f011506':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 03:15:48 +00:00
Stuart Scott
a93dee63de am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89 
* commit '9017e0613271d35dc4ea1a011268e1cf0165c907':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:15:41 +00:00
Dongwon Kang
e2e7e9df8b Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 
automerge: 085329b

* commit '085329b69abc0751591f99faf8a7e8fc2dc7c9df':
  TIF: Fix a typo and remove an unused method in TvInputService
 2014-11-04 03:07:00 +00:00
Eric Laurent
8e264a7703 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 
automerge: 8befd6f

* commit '8befd6fd051e3c5d7c8e4c804664b8c69f91335a':
  AudioService: fix cross deadlock
 2014-11-04 03:05:27 +00:00
David Friedman
5880c9c269 am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
automerge: 6666f34

* commit '6666f34c9b6617b0f9ac3915a05b01f19cb8ac22':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 03:03:46 +00:00
Stuart Scott
9017e06132 Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev 
automerge: b600d89

* commit 'b600d890a606692b319efbd0222c7c60a6b45b9f':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:02:25 +00:00
Deepanshu Gupta
b490d5d3ec am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001 
* commit '0267541c90a33c2558d93a0250791ac8fb679688':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 02:50:24 +00:00
Deepanshu Gupta
9549824d2b am 6479282e: am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a automerge: 9a6d8ae 
* commit '6479282ef584285a2da4d3750acec5ce7d13b6bb':
  Support framework menus in ActionBar
 2014-11-04 02:50:18 +00:00
Deepanshu Gupta
837e65be0d am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763 
* commit 'a36980980886a645627542a7bcabf0d718ea79c9':
  Use the right layout for inflating Action Bar.
 2014-11-04 02:50:10 +00:00
Dongwon Kang
085329b69a Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 2014-11-04 02:41:54 +00:00
Adam Lesinski
0cc963c663 Fix build due to bad merge 
- tools/aapt/qsort_r_compat.c was removed
  and the merge added it back to the src list in Android.mk

Change-Id: I15aae8adc68f82ac2381020ac0b96a7b1ab59f9c
 2014-11-03 18:37:49 -08:00
Baligh Uddin
e4ef64da70 am dc9dc7fa: (-s ours) am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours automerge: ecd9daa -s ours 
* commit 'dc9dc7fa9499b279571c7256815448014b1696ed':
  Import translations. DO NOT MERGE
 2014-11-04 02:21:23 +00:00
Nancy Chen
4f03fa903b am bff9a23a: am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 
* commit 'bff9a23ab3acc54aa64f6dea0a5ac10aaafec6b5':
  Adn queries for multi-SIM. (2/3)
 2014-11-04 02:21:17 +00:00
Dianne Hackborn
726715e113 am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit 'e6fa3f44652fd9e23ce64f39bb43458fa4abd60a':
  Few more small meminfo improvements.
 2014-11-04 02:21:11 +00:00
Bryce Lee
1e2a01a6ed am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4 
* commit '68993a41b35eb82459b3686c9baff54f980168ed':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 02:21:05 +00:00
Dirk Dougherty
52973fa234 am 0b8ae553: am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1 
* commit '0b8ae553e89e93f73de4fff6ca2c46745177ed9c':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 02:20:59 +00:00
Adam Lesinski
4dfff4e727 am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 
* commit '5fa9021822577f1e4676db49a6b5cb5d36e4614a':
  Build the split-select tool without C++11 support
 2014-11-04 02:20:47 +00:00
Adam Lesinski
3fd340028f Merge commit '78be0498' into manualmerge 
Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
 2014-11-03 18:06:22 -08:00
Eric Laurent
8befd6fd05 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 2014-11-04 02:00:32 +00:00
David Friedman
6666f34c9b am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit 'e20e2b9a4863144633bb5ba9d7bedf7d0948c760':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 01:34:05 +00:00
Eric Laurent
8fa4d6f585 AudioService: fix cross deadlock 
Fix cross deadlock between VolumeStreamState.class and
VolumeStreamState instance synchronization.

Do not synchronize on VolumeStreamState instance anymore.

Also document the locking order for synchronization objects
related to volume management.

Bug: 18159081.
Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312
 2014-11-03 17:30:41 -08:00
Stuart Scott
b600d890a6 Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev 2014-11-04 01:29:00 +00:00
Deepanshu Gupta
0267541c90 am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 
automerge: fef5001

* commit 'fef500107ea558bfc210230a3cd8281d7fea6fd5':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 01:24:41 +00:00
Deepanshu Gupta
6479282ef5 am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a 
automerge: 9a6d8ae

* commit '9a6d8ae25522f88191e8b7d817c1d4e5816b642b':
  Support framework menus in ActionBar
 2014-11-04 01:23:39 +00:00
Deepanshu Gupta
a369809808 am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
automerge: 5ad0763

* commit '5ad076396c43b2d26f9c020f0914623972cadd0e':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:22:24 +00:00
Baligh Uddin
dc9dc7fa94 am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours 
automerge: ecd9daa  -s ours

* commit 'ecd9daab207b297a1b7404457b3578bcda9ca51d':
  Import translations. DO NOT MERGE
 2014-11-04 01:21:03 +00:00
Deepanshu Gupta
fef500107e am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 
* commit '0a2e42d4afe9aa81cc41674102dfc999496db845':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 01:08:43 +00:00
Deepanshu Gupta
9a6d8ae255 am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a 
* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
  Support framework menus in ActionBar
 2014-11-04 01:08:39 +00:00
Deepanshu Gupta
5ad076396c am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:08:23 +00:00
David Friedman
e20e2b9a48 am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit '5a416a4905ba2f347a9837c1f578327c239f5910':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 01:06:41 +00:00
Nancy Chen
bff9a23ab3 am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 
* commit 'f950301945164f5318ea50401fcf23bef824fa9c':
  Adn queries for multi-SIM. (2/3)
 2014-11-04 01:02:37 +00:00
Dianne Hackborn
e6fa3f4465 am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit 'd1f1ea76e854d518803d68a31e35b34841468f4c':
  Few more small meminfo improvements.
 2014-11-04 01:01:35 +00:00
Bryce Lee
68993a41b3 am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4 
* commit '99a6c1cbe83baff199be6fd69234e20b4b14241d':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 01:01:29 +00:00
Dirk Dougherty
0b8ae553e8 am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1 
* commit '73e558664d56a68745f9f4b2dc23bfee39ec624a':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 01:01:19 +00:00
Adam Lesinski
5fa9021822 am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 
* commit 'f7ffcaa7a478eaafc121e84b14dcaf2503dd5457':
  Build the split-select tool without C++11 support
 2014-11-04 01:01:13 +00:00
Adam Lesinski
78be0498af am 668f0a35: Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 
* commit '668f0a356cba44c22d8ca0c9f4711613885d46a9':
  Fix issues that will be present in C++11
 2014-11-04 01:01:06 +00:00
David Friedman
5a416a4905 am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit 'a827de4e8bcd8d90987387b1acf8d8856104e21c':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 00:59:31 +00:00
Baligh Uddin
ecd9daab20 am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours 
* commit 'aa816de4e061ae5a70c759a1c6e55d111c636b6d':
  Import translations. DO NOT MERGE
 2014-11-04 00:56:16 +00:00
Deepanshu Gupta
0a2e42d4af Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 
automerge: 9b64954

* commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 00:51:51 +00:00
Nancy Chen
f950301945 Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 2014-11-04 00:51:29 +00:00
Deepanshu Gupta
33996b9878 Merge "Support framework menus in ActionBar" into lmp-dev 
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
  Support framework menus in ActionBar
 2014-11-04 00:50:48 +00:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev 
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
 2014-11-04 00:49:43 +00:00
Baligh Uddin
aa816de4e0 Import translations. DO NOT MERGE 
automerge: 07dd521  -s ours

* commit '07dd52188ccafac3cec01122b132666f2bd8e32e':
  Import translations. DO NOT MERGE
 2014-11-04 00:48:44 +00:00
Dianne Hackborn
d1f1ea76e8 Merge "Few more small meminfo improvements." into lmp-mr1-dev 2014-11-04 00:41:54 +00:00
Bryce Lee
99a6c1cbe8 Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev 
automerge: abf33e4

* commit 'abf33e48baff1ffc14562a499ec3eabc09a5dbb5':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 00:23:50 +00:00
Dirk Dougherty
73e558664d am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. 
automerge: 45729a1

* commit '45729a10495ed828749a706066b69051512bf4f0':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 00:21:53 +00:00