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

176530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
aefb79b2dd am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev 
* commit '31bd4220855ded4ece67c8ae75227441a12a00a7':
  Remove notification for SoftAP turned on
 2014-12-04 15:16:26 +00:00
Geoff Mendal
c7d8a48bb0 am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'cc7c68b54801e07107d6e212ae50a375d730e000':
  Import translations. DO NOT MERGE
 2014-12-04 15:16:21 +00:00
Geoff Mendal
c7b5257521 am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'a821e77d7ede196f6f39cd2ed2bc974bc68e162d':
  Import translations. DO NOT MERGE
 2014-12-04 15:16:15 +00:00
Craig Mautner
6465980cd8 am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" 
* commit 'e879b2ae69bf7ef159dbdc068423526d5db99df0':
  Prevent ANR when broadcast receiver is killed
 2014-12-04 15:16:11 +00:00
Geoff Mendal
5d1f688034 am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '72a204199510afdeb9cec483b4113433fe61089e':
  Import translations. DO NOT MERGE
 2014-12-04 15:16:10 +00:00
Erik Kline
95b5ca9019 am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev 
* commit '9261d9d64548f0221de50eb99f3675488a4176a4':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
 2014-12-04 15:16:04 +00:00
Chih-hung Hsieh
0ebbfaedd7 am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit 'ccce6e0f9f6f4da95d61fb2cfb1253ac662fba30':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 15:16:04 +00:00
John Spurlock
959312701f am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev 
* commit '32b61ab28f54e5b00f472b2166f9b1100375e4ff':
  Doze: Don't block pickup pulses on a proximity check.
 2014-12-04 15:15:59 +00:00
Pavel Zhamaitsiak
3891681969 am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev 
* commit '1fb699360d1b193c5144c7dcf209d8dc8dfbb8b8':
  IMS Call End Cause Additions
 2014-12-04 15:15:53 +00:00
duho.ro
36ccf75bb2 am fb754252: UICC : discard language setting of SIM 
* commit 'fb7542522493101778862340c548db731f3a8681':
  UICC : discard language setting of SIM
 2014-12-04 15:15:40 +00:00
Cheuksan Wang
dba26aa2e7 am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit '109ec376da86de1275f73fa432d6344431a457e9':
  new SMS/MMS carrier app API
 2014-12-04 15:15:33 +00:00
John Reck
a51a0901ad am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev 
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
  Resume RT-animations after a pauseSurface
 2014-12-04 15:15:27 +00:00
Winson Chung
4eb896ef01 am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit 'ba1307b2b42b60893c88622f41f99efa2356350d':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 15:15:21 +00:00
Jim Miller
f2b934b42b am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit '3ea6824034ea8fbcd418af8e07606f60fd844e45':
  Stop keyguard from spamming the log
 2014-12-04 15:15:16 +00:00
xinhe
9a4472bf45 am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit '8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 15:14:59 +00:00
Wink Saville
0304c529b6 am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '82611e6d9c48a1a9b5d8b37b25425b7d7354ef4f':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 15:14:49 +00:00
Christopher Tate
e808d2df76 am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit '758f45217d9b7d257258ea41aa53f6364ac13918':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 15:14:43 +00:00
Derek Sollenberger
4d9da135ca Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev 2014-12-04 13:04:52 +00:00
Christoph Studer
c9660bdf28 Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev 2014-12-04 12:12:25 +00:00
Yohann Roussel
e1c00320b6 Merge "Allow compilation with Jack." 2014-12-04 09:26:54 +00:00
Adam Lesinski
8e5362f20e am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '503071ae41374a66f61e53e05a91243473db83b9':
  RRO: prevent duplicate system overlays
 2014-12-04 09:21:45 +00:00
Deepanshu Gupta
7e168ad04a am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '6cbef4bd3e1f16647ab01dc29df9a357d54a85de':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 07:00:19 +00:00
Deepanshu Gupta
302a7cc13a am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '4628d51a0d01641ca7fe2cf8403ad551ea6f50ce':
  Fix AnalogClock rendering
 2014-12-04 07:00:14 +00:00
Deepanshu Gupta
b2ded18a84 Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev 2014-12-04 06:58:25 +00:00
Jinsuk Kim
f164739510 Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev 2014-12-04 06:40:01 +00:00
Vinit Deshpande
31bd422085 Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev 2014-12-04 06:21:30 +00:00
Jinsuk Kim
3cd30516ad CEC: Generate hotplug events upon adding listener 
CEC HAL does not report initial connection state of the HDMI port
but does it only when the state is updated. For the listeners which
want to get the initial state of the ports, this CL generates
hotplug event per each port when a new listener is added.

Bug: 18488079

Change-Id: I6915a96e3c14ee0db1bfb6912ab77d3ea1bd2f07
 2014-12-04 15:16:57 +09:00
Geoff Mendal
48d196b9c5 Merge "Import translations. DO NOT MERGE" 2014-12-04 05:46:30 +00:00
Geoff Mendal
2dadff70d4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 05:44:59 +00:00
Geoff Mendal
cc7c68b548 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 05:32:21 +00:00
Geoff Mendal
4d69f10d56 Merge "Import translations. DO NOT MERGE" 2014-12-04 05:29:42 +00:00
Geoff Mendal
3b05d2bd6f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 05:05:34 +00:00
Deepanshu Gupta
f708d27fa0 resolved conflicts for merge of fb30a783 to lmp-mr1-dev 
Change-Id: I91fdb76c748b97376d6469c8d1198a15c4395463
 2014-12-04 10:30:40 +05:30
Geoff Mendal
a821e77d7e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 04:54:55 +00:00
Geoff Mendal
09a45a2f21 Merge "Import translations. DO NOT MERGE" 2014-12-04 04:43:06 +00:00
Geoff Mendal
2253b8c576 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 04:39:37 +00:00
Geoff Mendal
72a2041995 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 04:33:28 +00:00
Erik Kline
9261d9d645 Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev 2014-12-04 03:14:02 +00:00
John Spurlock
32b61ab28f Merge "Doze: Don't block pickup pulses on a proximity check." into lmp-mr1-dev 2014-12-04 03:03:22 +00:00
Pavel Zhamaitsiak
1fb699360d Merge "IMS Call End Cause Additions" into lmp-mr1-dev 2014-12-04 01:59:49 +00:00
Craig Mautner
e879b2ae69 Merge "Prevent ANR when broadcast receiver is killed" 2014-12-04 01:56:39 +00:00
Kenji Sugimoto
4472fa9780 Prevent ANR when broadcast receiver is killed 
If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.

As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.

Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.

Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a
 2014-12-03 17:53:06 -08:00
duho.ro
fb75425224 UICC : discard language setting of SIM 
Some carrier card has incorrect language file.
This is to disable loading language setting from SIM card.

Bug: 18095177
Bug: 18108786
Change-Id: I40881fc64fea52480c968a18440740af9c8cff57
 2014-12-04 01:51:15 +00:00
Omkar Kolangade
93c33d7d90 IMS Call End Cause Additions 
Adding call end reasons for the
following use cases:
1. User rejects/ends call due to
   low battery.
2. User rejects call due to
   blacklisted call ID.

Bug: 18481702
Change-Id: I3537c732880e60218c83ec69861cb788adc57bc1
 2014-12-04 01:30:34 +00:00
Svet Ganov
fdd2442b62 Update accessibility event constants in the service registration XML. 
An accessibility service may be configured to receive only certain event
types in the meta-data XML file. This change adds some missing event types
to the possible events to register for in the XML. This ensures parity
between the Java API and the XML declaration.

bug:18528776

Change-Id: Ie516f356db81fb1fb39f8d3a61b1edcbba1c7448
 2014-12-04 01:10:47 +00:00
Chih-hung Hsieh
ccce6e0f9f Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 2014-12-04 01:04:09 +00:00
Cheuksan Wang
109ec376da Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 2014-12-04 00:19:06 +00:00
John Reck
bd15e4f59c Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev 2014-12-04 00:08:16 +00:00
Winson Chung
ba1307b2b4 Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* changes:
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 00:07:57 +00:00
Jim Miller
3ea6824034 Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 2014-12-03 23:44:32 +00:00