Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Crowley
fbeeac8266 Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 2014-12-02 14:44:27 +00:00
Paul Jensen
0cc1732cfb Remember to cancel lingering when a network again satsifies a NetworkRequest. 
When WiFi's score drops and then comes back up we would previously linger
WiFi but forget to cancel the linger timeout, so 30s later WiFi would
unexpectedly tear down.  Also, make sure this is only done for created
Networks as "created" is the signal to initialy match Networks and requests.

bug:18169560
Change-Id: Ia69b110f6473371e556c60b950253758e023b7aa
 2014-12-02 09:26:17 -05:00
Christoph Studer
0d6ef4bd2b NoMan: Update effect suppressor on listener remove 
When a listener requested HINT_HOST_DISABLE_EFFECTS,
fire ACTION_EFFECTS_SUPPRESSOR_CHANGED when it's removed.

Bug: 18578756
Change-Id: Ia20793f17fc376130f370e736efad8b15f0cfa6d
 2014-12-02 15:00:48 +01:00
Adrian Roos
71bbbf6d59 am 86390e72: am 3590a45e: am c3056190: Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
* commit '86390e72a15b402b133c17f92eda2876891e36f6':
  Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar
 2014-12-02 13:12:07 +00:00
Adrian Roos
86390e72a1 am 3590a45e: am c3056190: Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
* commit '3590a45ed2891ed0c9aa5d1d92be80774b43c5c7':
  Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar
 2014-12-02 13:06:03 +00:00
Adrian Roos
3590a45ed2 am c3056190: Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
* commit 'c3056190ae1a6d29ce5943d45ab4711e1e49620c':
  Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar
 2014-12-02 12:58:47 +00:00
Adrian Roos
c3056190ae Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
Bug: 18518939
Bug: 17691219
Change-Id: I90b9afbbb1a550b5328a581b4fb6aadfa3ff2559
 2014-12-02 12:52:07 +00:00
Paul Crowley
2934b266e5 Add a tag to separate paragraphs in Javadoc 
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
 2014-12-02 11:21:13 +00:00
Kenny Guy
a6df20fdcf am 895fcefe: am c4f32bb7: am 8f52135f: Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 
* commit '895fcefec13a73bf4821dc7259c9f83828b3f713':
  Allow apps from managed profles to close notification shade.
 2014-12-02 10:36:19 +00:00
Kenny Guy
895fcefec1 am c4f32bb7: am 8f52135f: Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 
* commit 'c4f32bb74315d36217238acc0af8fbf798a2cd09':
  Allow apps from managed profles to close notification shade.
 2014-12-02 10:29:04 +00:00
Kenny Guy
c4f32bb743 am 8f52135f: Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 
* commit '8f52135f2c555ae0a13393b60ed0552ee9e149da':
  Allow apps from managed profles to close notification shade.
 2014-12-02 10:21:53 +00:00
Kenny Guy
8f52135f2c Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 2014-12-02 10:17:21 +00:00
Deepanshu Gupta
5ceb7f6431 Ensure that RandomAccessFile is not leaked. 
This change ensures that RandomAccessFile is always closed. Also, it
changes the BufferIterator implementation to delegate to the byte buffer
directly instead of mainitaining the position itself.

Change-Id: I8f93e80c91a7c35e6a7fb015185b8b11e36b6286
 2014-12-02 14:24:36 +05:30
Andre Eisenbach
2b5f59d524 am b45c38ac: am fcb94852: am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 
* commit 'b45c38acc7c4ea0eaa79209e0d6de7c4f0f34c52':
  Add server-side callback for change in MTU (4/4)
 2014-12-02 08:24:19 +00:00
Andre Eisenbach
b45c38acc7 am fcb94852: am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 
* commit 'fcb948526ff400b0773a44aecd56c366c13efa98':
  Add server-side callback for change in MTU (4/4)
 2014-12-02 08:14:11 +00:00
Andre Eisenbach
fcb948526f am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 
* commit 'a1a6c300afffebfb46e84dc1941f6bddca145a8f':
  Add server-side callback for change in MTU (4/4)
 2014-12-02 08:07:48 +00:00
Andre Eisenbach
a1a6c300af Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 2014-12-02 08:02:02 +00:00
Jinsuk Kim
59efa5ec9c am f2d68c88: am bfe763d1: am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 
* commit 'f2d68c8811db6fee4650ae5cd310cbe54744d9df':
  audioservice: system audio control in master volume mode
 2014-12-02 07:42:56 +00:00
Dongwon Kang
0e7a556844 am b076324c: am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit 'b076324c64060161e75c35f43c688f7cf067e396':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:42:50 +00:00
Erik Kline
80a4543ca2 am d8b011a3: am d125266b: am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 
* commit 'd8b011a3548910a26d5b7a451bafb07b5384e246':
  Revert some verbose logging from ag/489226
 2014-12-02 07:42:45 +00:00
Jinsuk Kim
f2d68c8811 am bfe763d1: am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 
* commit 'bfe763d1c96fe0f8e704743160a478d2e698a801':
  audioservice: system audio control in master volume mode
 2014-12-02 07:36:10 +00:00
Dongwon Kang
b076324c64 am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit '3599af39e45af0498daa4873216a8cf4d6fe67f9':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:36:05 +00:00
Erik Kline
d8b011a354 am d125266b: am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 
* commit 'd125266b3c0cabcb42e6331a312c66071fedd752':
  Revert some verbose logging from ag/489226
 2014-12-02 07:35:59 +00:00
Jinsuk Kim
bfe763d1c9 am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 
* commit 'b4355ec3d0f7ab0aa44a746df7df250466cd701e':
  audioservice: system audio control in master volume mode
 2014-12-02 07:29:16 +00:00
Dongwon Kang
3599af39e4 am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit '7cfe00f69380573e9c989bbbc614930c279f2291':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:29:10 +00:00
Erik Kline
d125266b3c am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 
* commit 'f27b52aaa75884a41ea687116ff3758125b94e39':
  Revert some verbose logging from ag/489226
 2014-12-02 07:29:05 +00:00
Jinsuk Kim
b4355ec3d0 Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 2014-12-02 07:26:41 +00:00
Dongwon Kang
7cfe00f693 Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 2014-12-02 07:26:07 +00:00
Erik Kline
f27b52aaa7 Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 2014-12-02 07:22:33 +00:00
Lorenzo Colitti
f89d840c87 am 5d1aeef0: am 28ca40ff: am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 
* commit '5d1aeef0e98e93fd3031522a61d53b1786e7effb':
  Only use mDefaultDns if the network claims to offer Internet
 2014-12-02 07:07:41 +00:00
Lorenzo Colitti
5d1aeef0e9 am 28ca40ff: am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 
* commit '28ca40ff78dc5e62d0e26e7340b74ad6e5ba767e':
  Only use mDefaultDns if the network claims to offer Internet
 2014-12-02 07:00:45 +00:00
Lorenzo Colitti
28ca40ff78 am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 
* commit '32f3518dccf5c599c21b54095abe561f48277898':
  Only use mDefaultDns if the network claims to offer Internet
 2014-12-02 06:53:53 +00:00
Lorenzo Colitti
32f3518dcc Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 2014-12-02 06:47:52 +00:00
Sungsoo Lim
f8225d3dd5 am 628e5214: am 1f35568d: am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev 
* commit '628e52147bf2df00f180b4c9157398edaffb2b19':
  Missing Javadoc update while API review
 2014-12-02 06:47:08 +00:00
Jinsuk Kim
e653602168 CEC: Set the parameter of <System Audio Mode Request> right 
The parameter should be the physical address of the source device
not that of AVR.

Bug: 18582101

Change-Id: I3f7fd71ab87f174babc0d2bb10b2661df19336eb
 2014-12-02 15:38:39 +09:00
louis_chang
62cfde1442 [ActivityManager] Fix race condition in pss collection 
Symptom:
There has a race condition that two threads are accessing
the mPendingPssProcesses simultaneously. One of the thread
is collecting the process pss by looping the mPendingPssProcesses.
The other thread is requesting to collect pss of all processes,
which clears mPendingPssProcesses and adding processes back.

Solution:
Avoid race condition by adding synchornized protection.

Change-Id: Ifb090eda9c4a1b8e3fd980fe0171e9dd77773b46
 2014-12-02 12:57:39 +08:00
louis_chang
3d9c431ca4 [ActivityManager] Invalidate last screenshot when activity relaunched 
Symptom:
The task thumbnail is not updated when activity relaunched.

Reproduce Steps:
1. Put device in portrait
2. Launch Calculator
3. Launch Recent App (the Calculator's screenshot is correct)
4. Rotate device to landscape
5. Click Calculator in Recent App to return to Calculator (Calculator has relaunched to landsacpe ui)
6. Launch Recent App again (the Calculator's screenshot is not updated)

Change-Id: I92e951ea2ee215c52ca6e50cf6f9e02deb787bce
 2014-12-02 12:38:05 +08:00
younghwan1.kim
8f6fc81500 bug fix possible NPE while startProcessLocked() 
In case, process doesn't create well while startingProcessLocked().
There is possibility to make NPE.
Setting app's crash handler needs to be assigned after null check routine.

Change-Id: I67fb6427f72d93f79fed36eb44c47d37eafdac31
 2014-12-02 13:04:40 +09:00
Sungsoo Lim
628e52147b am 1f35568d: am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev 
* commit '1f35568d075e8c0401e3b00591dde2f6f3218b48':
  Missing Javadoc update while API review
 2014-12-02 03:40:46 +00:00
Sungsoo Lim
1f35568d07 am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev 
* commit '5a7445b00d267db966cc72cd905aaf2379e64b6b':
  Missing Javadoc update while API review
 2014-12-02 03:33:22 +00:00
Sungsoo Lim
5a7445b00d Merge "Missing Javadoc update while API review" into lmp-mr1-dev 2014-12-02 03:29:10 +00:00
Yigit Boyar
57f3548173 am f4835bd7: am d11e2b7c: am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 
* commit 'f4835bd7b137aafac06ae43a55a6cbc51104e1c2':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
 2014-12-02 02:26:04 +00:00
Yigit Boyar
f4835bd7b1 am d11e2b7c: am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 
* commit 'd11e2b7cdd283ebfd2c41e7616a54bcc084d0a30':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
 2014-12-02 02:19:22 +00:00
Alan Viverette
8b08e2c6af am 6591b025: am cc636f08: am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 
* commit '6591b0259cbd6f694303e7068d8b1578f4c2dc2a':
  Only send haptic events from time picker when time changes
 2014-12-02 02:17:33 +00:00
Sanket Padawe
63224c3954 Call entitlement on clicking tethering tile in quick settings. 
Call a new activity which would handle enabling of tethering on clicking
Tethering tile in Quick Settings.

Bug: 18368949
Change-Id: I4cc2ba01f6fa1ac005ba1dc27b223b5fc5359d35
 2014-12-01 18:14:40 -08:00
Yigit Boyar
d11e2b7cdd am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 
* commit '498c84e7366cc0b4355f034bd03534a14beaf166':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
 2014-12-02 02:12:06 +00:00
Cheuksan Wang
b72eb97e4b new SMS/MMS carrier app API 
Changes based on api council review

BUG: 18005911
Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b
 2014-12-01 18:11:07 -08:00
Alan Viverette
6591b0259c am cc636f08: am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 
* commit 'cc636f08249011f0e99b7d7ddfca31e2c7a9bec3':
  Only send haptic events from time picker when time changes
 2014-12-02 02:10:12 +00:00
Yigit Boyar
498c84e736 Merge "Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 2014-12-02 02:07:26 +00:00
Alan Viverette
cc636f0824 am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 
* commit '4515f785878cb150bef467d40abc9d5b172570fe':
  Only send haptic events from time picker when time changes
 2014-12-02 02:03:49 +00:00