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

120325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kilbourn
032305fbcf am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 
* commit 'b559b37150d24411f0b5ef102ced8d5acf858a0e':
  Dump leanback info in aapt dump badging.
 2014-03-08 01:55:00 +00:00
Ying Wang
f5f4d93060 am 74bebf6f: Exclude the host aapt and aidl from PDK build. 
* commit '74bebf6faed2d34814ffc3d46664330ea568f7b2':
  Exclude the host aapt and aidl from PDK build.
 2014-03-08 01:54:52 +00:00
Tim Kilbourn
b559b37150 Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 2014-03-08 00:55:48 +00:00
Robert Greenwalt
fcbced38a6 DO NOT MERGE Debounce wifi country code Info 
We're getting signals from the radio and it sometimes drops out for
a while.  This change will delay applying an empty country code
for 15sec but apply non-empty country codes immediately.  It uses a
sequence number so we only apply the most recent change, even if
it's delayed.

Also secures the wifi call to set the country code as we can't
allow apps to set it willy-nilly.

bug:11062898
Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a
 2014-03-07 16:54:58 -08:00
Tim Kilbourn
0a5a5d6996 Dump leanback info in aapt dump badging. 
Leanback launcher activities are reported, including the banner.

Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
 2014-03-07 16:47:42 -08:00
Benoit Goby
a26d08e612 Add CAP_BLOCK_SUSPEND to system server 
With linux 3.5 and above, CAP_BLOCK_SUSPEND is needed to take a
suspend blocker.

CAP_BLOCK_SUSPEND has aleady been added in master.

Change-Id: Ibd4b1f8498c3c4a7b69ea9fc68311546a8f0ecda
 2014-03-08 00:17:43 +00:00
Ying Wang
74bebf6fae Exclude the host aapt and aidl from PDK build. 
Bug: 13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
 2014-03-07 15:56:14 -08:00
Marco Nelissen
110af567e6 am 8e701650: am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '8e701650179c8373a4fc5bf306befc3af2560e9d':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 23:39:24 +00:00
Vineeta Srivastava
d6a263f46b am 230e20d2: am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit '230e20d26815ecc1aea1a4709cd7e188d049360f':
  telephony: Add same named operator configuration for some operators
 2014-03-07 23:39:20 +00:00
Jeff Brown
6f9f8e7aad am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 
* commit '01b5e765e59c14cdfb62f1a8684e9116a46874d2':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
 2014-03-07 23:39:12 +00:00
Adam Powell
96192157b8 am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit 'f175b19aaac7ffe5553013d996a073693cac929d':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-07 23:38:30 +00:00
Marco Nelissen
f41efb446a am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit '57a45f22ea7b0509fb918fa39e797a6061f75438':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-07 23:38:27 +00:00
Dave Allison
b94904ab6d am 3fc3b9fd: Merge "ART profiler usage." 
* commit '3fc3b9fd1bf71351bf1ff2d49d6e10b6acabf068':
  ART profiler usage.
 2014-03-07 15:38:26 -08:00
Craig Mautner
9bf7f893e0 am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '93df07a1b72488b64354098cd00dff1d36b76b12':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-07 23:38:20 +00:00
Adam Powell
f175b19aaa Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 2014-03-07 23:28:19 +00:00
Marco Nelissen
57a45f22ea Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 2014-03-07 22:49:33 +00:00
Craig Mautner
93df07a1b7 Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 2014-03-07 22:30:26 +00:00
Dave Allison
3fc3b9fd1b Merge "ART profiler usage." 2014-03-07 22:25:43 +00:00
Jeff Brown
01b5e765e5 Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 2014-03-07 22:15:08 +00:00
Elliott Hughes
0bb17193cc Fix a JNI local reference leak in JNIMediaPlayerListener::notify. 
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
 2014-03-07 14:10:52 -08:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP. 
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
 2014-03-07 14:02:55 -08:00
Marco Nelissen
8e70165017 am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '344251969929dcb37a33a3e3910121458f7dc38f':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:46:38 +00:00
Vineeta Srivastava
230e20d268 am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit '5ef72c30847a0b29c35489fef30bc21fe5a5dcfe':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:46:35 +00:00
Marco Nelissen
3442519699 am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit 'ac87587875f1dfade5e06a82ccc009d0f0170569':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:18:52 +00:00
Vineeta Srivastava
5ef72c3084 am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'f066adde7a3722deba0226715af695537511271e':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:18:47 +00:00
Marco Nelissen
ac87587875 am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:12:21 +00:00
Vineeta Srivastava
f066adde7a am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'dbeb0c12950e92a59671f8da7952ddf3486789b4':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:12:17 +00:00
Dave Allison
0efbd9a463 ART profiler usage. 
This is a change to add args to some of the profiler related
functions, including installd commands.

Also read properties and set command line options for the runtime
profiling parameters.

Changed calls to isDexOptNeeded() to isDexOptNeededInternal().  This
needs additional arguments passed for profiles.

Bug: 12877748
Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1

Conflicts:
	core/jni/AndroidRuntime.cpp
 2014-03-07 12:32:44 -08:00
Marco Nelissen
9823a170e4 Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 2014-03-07 20:23:29 +00:00
Vineeta Srivastava
dbeb0c1295 Merge "telephony: Add same named operator configuration for some operators" into klp-dev 2014-03-07 20:09:00 +00:00
Sungmin Choi
5d37e0d1b4 telephony: Add same named operator configuration for some operators 
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
 2014-03-07 11:29:18 -08:00
Vineeta Srivastava
66e9fa99a0 am b4fd0972: am 16ed831e: am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit 'b4fd09725b228e2d73518ce06ba413f838e002df':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:54:58 +00:00
Mike J. Chen
5adbea2e2d am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev 
* commit '784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78':
  Add handshake broadcast support
 2014-03-07 18:50:54 +00:00
Vineeta Srivastava
b4fd09725b am 16ed831e: am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit '16ed831eb391e1d08050c52579f316ed5505c1e8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:48:17 +00:00
Vineeta Srivastava
16ed831eb3 am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit '3d924f1e8d4664d47a1e5e3045ec450a36bb7009':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:45:11 +00:00
Mike J. Chen
784224d2f9 am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev 
* commit 'b8a7dd639eb680e7bcd410f7d3bd16c7ba6872ad':
  Add handshake broadcast support
 2014-03-07 18:44:22 +00:00
Vineeta Srivastava
3d924f1e8d am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:40:53 +00:00
Mike J. Chen
b8a7dd639e Merge "Add handshake broadcast support" into klp-modular-dev 2014-03-07 18:40:23 +00:00
Vineeta Srivastava
ef86ff5817 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 2014-03-07 18:37:42 +00:00
Sungmin Choi
22ec0dc353 Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE] 
This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
 2014-03-07 18:37:26 +00:00
Marco Nelissen
aefa427c27 Make MtpDatabase use libexif instead of libjhead 
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
 2014-03-07 10:30:23 -08:00
Leon Scroggins III
dbc7a4653f am 757ab3e6: am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit '757ab3e6df3f884b7ea36ae021c886513a2ce2ca':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:25:32 +00:00
Dianne Hackborn
38d12b07e7 am a6947c41: am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit 'a6947c418129acc0815aac8aee86be0db5360232':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:25:29 +00:00
Leon Scroggins III
757ab3e6df am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit '48df72f7db7456304bde16a6f000fd7d45ba5d13':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:21:54 +00:00
Dianne Hackborn
a6947c4181 am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '045ed665197ed3ba0681db173a058a55662cd16a':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:21:52 +00:00
Leon Scroggins III
48df72f7db am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:18:35 +00:00
Dianne Hackborn
045ed66519 am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '8e904d565e8a54f755814e9ae062743b8b012731':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:18:31 +00:00
Leon Scroggins III
74ca3fd34d am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit 'bc57651fb510d7b1a2811235f96e711b6be12a12':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:15:23 +00:00
Dianne Hackborn
8e904d565e am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:15:19 +00:00
Leon Scroggins III
bc57651fb5 Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 2014-03-07 18:13:29 +00:00