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

141947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Duff
51d70ce9b8 am c542745e: am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'c542745e23fe9d2e71c1f607d66f5570f585133d':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 09:43:56 +00:00
Brian Duff
c542745e23 am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 06:45:04 +00:00
Nick Kralevich
a347ece5a7 Merge "Fix typo in comment of FragmentTransaction" 2014-07-03 01:32:01 +00:00
Nick Kralevich
ce25948325 Merge "Added missing brace." 2014-07-03 01:32:01 +00:00
Nick Kralevich
a2e4ce2b7c Merge "Fix typo - issue 56671" 2014-07-03 01:32:01 +00:00
Nick Kralevich
8b333467fe Merge "fix trivial typo: s/meansure/measure" 2014-07-03 01:32:01 +00:00
Nick Kralevich
c9eff23b44 Merge "Fix typo in DevicePolicyManager documentation" 2014-07-03 01:32:01 +00:00
Nick Kralevich
eb822cecdb Merge "Typo fix in permission string" 2014-07-03 01:32:01 +00:00
Jason Sams
24bea6a3ef Resolve conflicts with AOSP. 
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
 2014-07-02 14:32:24 -07:00
Narayan Kamath
358a3f7168 Merge "fix AudioTrack and AudioRecord JNI" 2014-07-02 20:52:49 +00:00
Eric Laurent
90d0b9e1bb fix AudioTrack and AudioRecord JNI 
AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.

(cherry picked from commit 9d02848e902d04417df616354db3a18c03e639b7)

Change-Id: Ie36624d3ea06042373c64edced4b5e30b7b1ee86
 2014-07-04 09:37:28 +01:00
Craig Mautner
5acdd0f67d Merge "[ActivityManager] Ensure alive process is not killedByAm." 2014-07-02 20:52:43 +00:00
riddle_hsu
abc69e93d6 [ActivityManager] Ensure alive process is not killedByAm. 
Symptom: Unable to kill by Am again and will be skipped updating its oom adj.

Root Cause:
A restarted process will reuse original process record.
The flag killedByAm will keep previous state.

Solution:
Reset the flag killedByAm to false when the process is started.

Note: Found another similiar patch If95137d91939cc44882ad2813131bcde0edd0c1b


Change-Id: I59a86648ca8d0aed4c489d92751af120aae5ef90
 2014-07-04 13:33:19 +00:00
Nick Kralevich
ca2df28678 Merge "Fix typo in the exception message." 2014-07-02 20:52:43 +00:00
Nick Kralevich
77491ac00c Merge "Correct typo in doc comment" 2014-07-02 20:52:43 +00:00
Nick Kralevich
a6336747a4 Merge "Fix a copy/paste typo in ViewPropertyAnimator" 2014-07-02 20:52:43 +00:00
Nick Kralevich
63af727b4b Merge "Fix Issue 59989" 2014-07-02 20:52:43 +00:00
Nick Kralevich
b70888d455 Merge "Fix a typo in a javadoc comment" 2014-07-02 20:52:43 +00:00
Nick Kralevich
42b74e231d Merge "Typo in method name: Clone" 2014-07-02 20:51:20 +00:00
Nick Kralevich
3b345a6f91 Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 2014-07-02 20:51:20 +00:00
Brian Duff
a6e9dd3f9a Merge "Fix a typo in NumberPicker javadoc." 2014-07-02 20:51:20 +00:00
Craig Mautner
ef2e76675a Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists." 2014-07-02 20:49:53 +00:00
riddle_hsu
3145b24902 [ActivityManager] Avoid keeping restarting home when only home activity exists. 
Root Cause:
When there is only home activity existed,
updating home apk will call forceStopPackageLocked to finish the activity.
Then activity history becomes empty, then home will be launched,
but its package is still target to close that results a loop.

Solution:
If home activity has been force-stopped, do not stop the same home activity again.

Change-Id: Icff12028d407873c2e6f50a06bcad231b908ccbd
 2014-07-04 17:01:56 +08:00
Jorim Jaggi
3081f82742 Merge "Fix overlapping status bar icons." 2014-07-02 19:53:18 +00:00
Jorim Jaggi
4649c8d53f Fix overlapping status bar icons. 
Change-Id: I9ca4b9e026cb3cccdf9e30ab350d10d46b98d47e
 2014-07-09 17:04:01 +02:00
Deepanshu Gupta
11c2d1cfb9 am e5d9dca1: (-s ours) am d3a77b16: am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit 'e5d9dca16fa629d5cf5bdac38199de8052eb8336':
  Change font family name. [DO NOT MERGE]
 2014-07-09 14:57:43 +00:00
Jorim Jaggi
3f48f46d7e Update QS header to spec 
- Move brightness slider down.
- Make clock bigger when expanded.
- Show date in collapsed state.
- Change size of avatar depending on collapsed/expanded.

Bug: 15865202
Bug: 15381387
Change-Id: I7894edae495b5a2d12b4fe4637a9aa3fd2e58963
 2014-07-09 16:37:32 +02:00
Nick Kralevich
6752cba464 Merge "ConfigUpdateInstallReceiver: pass content via content provider" 2014-07-09 05:53:23 +00:00
Sailesh Nepal
e7ef59a77d Add Connection.setStatusHints 
This CL allows a connection to specify a status hint. The hint
contains a label and icon that can be displayed in the InCallUI.
For example, wifi calling can set a wifi icon and ssid.

Change-Id: I125628b74784d2303b9a429038a9f7ee604f241e
 2014-07-08 21:54:03 -07:00
Sailesh Nepal
24ae29623f Merge "Add Connection.setAudioModeIsVoip" 2014-07-08 21:53:37 +00:00
Sailesh Nepal
33aaae4a07 Add Connection.setAudioModeIsVoip 
This API will be used by Telecomm to set the call's audio mode.

Change-Id: I29028e614c598d1f2501c4dfdcdbfc929b09f925
 2014-07-09 00:19:59 +00:00
Andre Eisenbach
6dc7e4e46c Merge "LE: Un-hide new congestion control and MTU APIs" 2014-07-08 21:53:37 +00:00
Andre Eisenbach
45a0a1a689 LE: Un-hide new congestion control and MTU APIs 
Change-Id: I5ce395481620dd7ab611b1ab0eaeb5e29c4f13fa
 2014-07-08 17:09:38 -07:00
Prerepa Viswanadham
8e5270fdf5 Tie in BLE hw capabilities with api invocation and support. 
Change-Id: Ic1f0b3f156cf2fdde8f04b5c4384e4fd3d79623a
 2014-07-08 23:34:49 +00:00
Makoto Onuki
e2f91c20bf Merge "Update javadoc" 2014-07-08 22:56:18 +00:00
Makoto Onuki
95a9cfbf14 Update javadoc 
Change-Id: I25b51f59e56b571921bad0b790a74c3c0af1a141
 2014-07-08 17:11:54 -07:00
Robert Greenwalt
16e12abbef Add Trust to NetworkCapabilities. 
Indicates the user has indicated implicit trust of a network.  This
generally means it's a sim-selected carrier, a plugged in ethernet,
a paired BT device or a wifi they've asked to connect to.  Untrusted
networks are probably limited to unknown wifi AP.

Change-Id: I89490bdaa3c2d63d33f876c72d8b088dc155fa3d
 2014-07-08 23:55:18 +00:00
Makoto Onuki
521e86f4d7 Merge "Add new URI for enterprise caller-id." 2014-07-08 22:56:18 +00:00
Makoto Onuki
31cd6f717e Add new URI for enterprise caller-id. 
Bug 15779911

Change-Id: Ic4889ab03343a0e447af830ca383b51ffdcc2c5c
 2014-07-08 15:59:34 -07:00
Joe LaPenna
4bb015d90a CW on Master: Disable CaptivePortalTracker, EthernetService 
BUG: 15143878

Change-Id: I6c534a28c1fcd475982ae70e7f3af69f3a219e24
 2014-07-08 22:52:02 +00:00
Yorke Lee
ab5a6dc987 Merge "Rehide some fields in ContactsContract" 2014-07-07 19:25:01 +00:00
Yorke Lee
6355c8f7fc Rehide some fields in ContactsContract 
These fields were supposed to be hidden for L.

Change-Id: If87642f2574eccd7d80fae6f7b0817f777db9cce
 2014-07-08 14:31:55 -07:00
John Spurlock
4c8d3149ae Merge "Update status bar icon policy for volume + zen." 2014-07-08 02:17:58 +00:00
John Spurlock
a37e9c8dcb Update status bar icon policy for volume + zen. 
Only show vibrate in the volume slot, create a separate slot
for zen.

Bug:15831713
Change-Id: I9d23a2d370bc6f98be3bdc98c2990bbea6643ce7
 2014-07-08 09:40:31 -04:00
Alexandra Gherghina
539a7ef5c9 Removes cross profile package information when removing an user 
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.

Also renames method which needs write locks.

Bug: 15928463
Change-Id: I30b0f85cf90d3e0c289a37bcbaec8da63499a170
 2014-07-08 14:35:56 +01:00
Dake Gu
b06448abf9 Merge "add missing break for Activity options" 2014-07-07 17:47:39 +00:00
John Spurlock
5e9049a362 QS: Add limit to cellular data panel. 
Change-Id: I4d69ffe0681b89670d052ed18c5e4be4674d2d62
 2014-07-08 23:50:04 -04:00
Dake Gu
7ef70b001b add missing break for Activity options 
fix b/16166102

Change-Id: Iebe8c4d4e640a14b049ffa62d8decb062cfe8f12
 2014-07-08 18:37:12 -07:00
Jeff Sharkey
4ec2023349 Merge "Derive library path for upgraded system apps." 2014-07-07 17:47:39 +00:00
Fabrice Di Meglio
6828cd5bc4 Make more room for methods in framework jar 
- put android.filterfw and android.filterpacks in framework2

Change-Id: I1ecc6ab833d6c6d20d976789bacfd085f4e0bff9
 2014-07-08 22:16:00 +00:00