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

126846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
439cf5b433 am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
* commit '56a8f8b48ff1d0855209307b9076d6e9b348b59b':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 13:16:16 +00:00
Narayan Kamath
56a8f8b48f resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
 2014-03-31 14:10:53 +01:00
Narayan Kamath
439145f0e7 am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class." 
* commit 'ab561f5b4073055c414866ff3dbe8372263474a7':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 12:42:14 +00:00
Narayan Kamath
ab561f5b40 Merge "Don't make isSafeMode a field on the Zygote class." 2014-03-31 12:32:50 +00:00
Narayan Kamath
d1a8d9f452 Don't make isSafeMode a field on the Zygote class. 
This field is written and read exclusively by the system server,
and should therefore belong to the SystemServer class.

Change-Id: I2708a9a45c0c9cd1a6f563e8cc5844bd8c424bf7
 2014-03-31 13:16:45 +01:00
Christoph Studer
546bec8ebf Notification usage stats 
First cut of gathering implicit notification signals and computing
running stats.

Tracks:
1. Post, update, remove by apps
2. Click, dismissal by users

Stats are aggregated on user, user+pkg, and getKey() levels.

Current stats are printed as part of 'dumpsys notification'.

Change-Id: I06ecbf76e517509895f2f9eea5b9d19bf9a34975
 2014-03-31 12:50:13 +02:00
Narayan Kamath
37109819d0 am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '303d666f2e2b37120e0e9de206ce127e2a532026':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:53:35 +00:00
Narayan Kamath
303d666f2e am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '0e3f3c70226640759d5d705233fbe59f525355bb':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:48:27 +00:00
Narayan Kamath
0e3f3c7022 am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '91bbb75c75568dee854fb10633f8ce3683265ffd':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:41:39 +00:00
Narayan Kamath
91bbb75c75 Merge "Cast CallMethod's size_t parameters to jint" 2014-03-31 09:37:32 +00:00
Jinsuk Kim
00bc283453 am 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 
* commit '2e59bd788546e29e48b85bda72da6af61704113d':
  Replace individual methods with a consolidated CEC nativeSendmessage
 2014-03-31 01:50:56 +00:00
Jinsuk Kim
2e59bd7885 am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 
* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
  Replace individual methods with a consolidated CEC nativeSendmessage
 2014-03-31 01:44:51 +00:00
Jinsuk Kim
41eaa32c10 Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 2014-03-31 01:40:30 +00:00
Wink Saville
562ea3fc7b am 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '80b4e09849048a78e08911eff9907cae618eba35':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:23:30 +00:00
Wink Saville
80b4e09849 am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:17:38 +00:00
Wink Saville
44b43a51c7 am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:11:27 +00:00
Wink Saville
1e4cad8198 Merge "GlobalActions: Fix Airplane Mode on/off issue" 2014-03-30 00:15:22 +00:00
John Reck
0d1f634f4b Add invokeFunctor 
Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
 2014-03-28 20:57:32 -07:00
Wei Wang
ab4fc115e9 am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 
* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
  Callback on correct method when status is unsuccessful.
 2014-03-29 02:03:03 +00:00
Wei Wang
1b09c97d8a am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.
 2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful. 
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
 2014-03-29 01:42:41 +00:00
John Reck
c75db8266b Merge "Remove kStatusInvoke & kStatusDraw" 2014-03-29 01:41:50 +00:00
John Reck
903d6407b0 Merge "Remove DisplayList.java" 2014-03-29 01:41:44 +00:00
Chris Craik
42dda81e15 Merge "Update several stale RenderNode variable names" 2014-03-29 01:39:57 +00:00
Chris Craik
64a12e177d Update several stale RenderNode variable names 
Change-Id: I61c8c66f5a79e3a89ae0d3cffbfd351c05bd6a2b
 2014-03-28 18:12:12 -07:00
Michael Wright
84ad5d8891 am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 
* commit '5d7db503bd779fb712391174a2b12327a0f9ec51':
  Add InputDevice#supportsSource(int).
 2014-03-29 01:09:30 +00:00
Michael Wright
16ff04ca38 am 4669cfff: (-s ours) am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev 
* commit '4669cfff1ed590087eade846aee8b4ef58f31739':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
 2014-03-29 01:09:27 +00:00
Michael Wright
5d7db503bd am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
  Add InputDevice#supportsSource(int).
 2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev 
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
 2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0 Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1 Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev 
* changes:
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
 2014-03-29 00:56:00 +00:00
Chris Craik
69a30b5e54 Merge "Simplify RenderNode refresh/build/update process" 2014-03-29 00:07:07 +00:00
Chris Craik
df0c431e6c Simplify RenderNode refresh/build/update process 
A View's RenderNode is created lazily, but the instance never changes
afterward.

Change-Id: I0b05769cd49aa55061d3fb8c2ea55a04e8391e48
 2014-03-28 17:03:12 -07:00
Alan Viverette
efaf51ad0c Merge "Fix drag-to-open forwarding behavior" 2014-03-28 23:59:39 +00:00
nagarw
c3b7e6fd44 GlobalActions: Fix Airplane Mode on/off issue 
Issue: Unable to turn off Airplane mode from power button
       after phone reboot

Fix: Initialize mHasTelephony before the PhoneStateListener is
     registered to the TelephonyManager so that correct value
     of mHasTelephony is reflected when onServiceStateChanged
     callback is called.

Bug: 13697360
Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
 2014-03-28 16:54:58 -07:00
Alan Viverette
78efdbac8a Fix drag-to-open forwarding behavior 
BUG: 13695088
Change-Id: I4c6e824267b145e6dcedb1aa46c8378fd5b6ff83
 2014-03-28 16:53:56 -07:00
John Reck
750ca6dbdb Remove kStatusInvoke & kStatusDraw 
They are unused

Change-Id: I44ecf1164dc6bc1b09438e733976d5a97a25f00e
 2014-03-28 16:43:15 -07:00
Jeff Hao
7d89b85f49 am f1354dd2: am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater." 
* commit 'f1354dd206a74e1475e8c1f8682dfd9d5e146f00':
  Mark constructor as accessible in LayoutInflater.
 2014-03-28 23:40:36 +00:00
Craig Mautner
71888f54cb am 1872ce3e: am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off." 
* commit '1872ce3e7af0e2130a9e8f9f52983cd234f6ead0':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
 2014-03-28 23:40:33 +00:00
Michael Wright
7ef7ef0e05 am c9b937bb: am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings" 
* commit 'c9b937bbfae825e32158e06ca52f320ca3d6f464':
  Add support for additional international keyboard mappings
 2014-03-28 23:40:30 +00:00
Craig Mautner
4377086f94 am 9c99c55d: (-s ours) am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front." 
* commit '9c99c55d03a66ad5ba47584340c527c0f843bbe8':
  DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
 2014-03-28 23:40:27 +00:00
Adam Hampson
6f9bddc846 am e8609de4: am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 
* commit 'e8609de4fb3635ab7182283e94ac56b48c07463a':
  hdmi: cec: add permission name to dump permission denial message
 2014-03-28 23:40:23 +00:00
Aaron Whyte
868f373b65 am 23fd13de: am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public k 
* commit '23fd13de62762e98c32f2b7525f01f0bcdf416fd':
  Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
 2014-03-28 23:40:13 +00:00
Selim Gurun
b4f27c95bc Merge "Support for new gTLDs" 2014-03-28 23:35:10 +00:00
Glenn Kasten
c5d142428a Use set() return value instead of separate call to initCheck() 
Change-Id: I6874ca00512d30824ecec10b8dc289993b985c7b
 2014-03-28 16:32:10 -07:00
John Reck
673a784c60 Remove DisplayList.java 
Bug: 13478302

Change-Id: I88574ec585b7eb165f3009a4f0492c12f70d3513
 2014-03-28 23:19:52 +00:00
Jeff Hao
f1354dd206 am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater." 
* commit 'd648e5f7ba26fc835c0448740f33c49874d51a3b':
  Mark constructor as accessible in LayoutInflater.
 2014-03-28 23:05:46 +00:00
Craig Mautner
1872ce3e7a am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off." 
* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
 2014-03-28 23:05:42 +00:00
Michael Wright
c9b937bbfa am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings" 
* commit '6a14146b379b33a6bf947f02b2550fa97c5619b6':
  Add support for additional international keyboard mappings
 2014-03-28 23:05:36 +00:00