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

156048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
2ceaee6dea Import translations. DO NOT MERGE 
Change-Id: I9ae72e34f8e819d5c8e8b3f5c96cd737d680bde0
Auto-generated-cl: translation import
 2014-10-29 06:14:09 -07:00
Calin Juravle
d3a8c8aa53 Merge "Fix the length of a profiler system property" into lmp-mr1-dev 2014-10-29 11:19:23 +00:00
Wei Jin
5cfbcd3b9e Fix the length of a profiler system property 
This patch changes the profiler system property
"dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth"
so that the length of the option is less than PROP_NAME_MAX.

Bug: 17294224

(cherry picked from commit 4d033e1c44c1b94ea5311713b8cc8bfb56bdcdd2)

Change-Id: I10dd0b3bfa46b836def437a3822f6c48538167dd
 2014-10-29 11:17:42 +00:00
Erik Kline
befe778c73 Treat optimistic addresses as global preferred. 
If the kernel sends notification of an optimistic address then
treat is a useable address (isGlobalPreferred()).

Note that addresses flagged as IFA_F_OPTIMISTIC are
simultaneously flagged as IFA_F_TENTATIVE (when the tentative
state has cleared either DAD has succeeded or failed, and both
flags are cleared regardless).

Additionally: do not consider RFC 4193 ULA addresses sufficient
for "global preffered".  They are, by definition, of global scope
but not sufficient for global reachability.

Bug: 17769720
Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a
 2014-10-29 19:11:58 +09:00
Jinsuk Kim
8be95fdde6 Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 2014-10-29 06:44:36 +00:00
Anthony Lee
6727926a96 Added a function to clear accounts for a specified package. 
Right now, clearAcounts() only clears the accounts
for the calling package. This new function will allow a class like
PhoneAccoutBroadcastReceiver to clear accounts for any package.

Bug: 17689845
Change-Id: I24db104268535e7e0e33e093e8fab63765df0b08
 2014-10-28 22:39:58 -07:00
Lorenzo Colitti
def4cd4fa4 Merge "Support more than one clatd at a time." into lmp-mr1-dev 2014-10-29 03:43:04 +00:00
Jinsuk Kim
5fe3a6cbfc CEC: Use language code "chi" for Traditional Chinese 
Android by default returns "zho" for all sorts of Chinese variants.
Use "chi" for traditional one used in Taiwan/Hong Kong/Macau
as required in CEC standard.

Bug: 18149804

Change-Id: I86ac7e2f0f1121641c52032a0d98a6405554457c
 2014-10-29 11:48:19 +09:00
Alan Viverette
05b2fedcb8 Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 2014-10-29 01:10:09 +00:00
Alan Viverette
f6a36e9cf3 Inflate ActionMode items against the ActionBarContextView theme 
BUG: 18078900
Change-Id: I300a0268bacf7e1ebcd64eac3d79548e1c4a9606
 2014-10-28 17:50:59 -07:00
Shishir Agrawal
c8787beca6 Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 2014-10-29 00:15:51 +00:00
Ihab Awad
6c37f374b5 Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev 2014-10-28 23:48:20 +00:00
Ihab Awad
074bf104c8 PhoneAccounts include literal icon bitmap (1/4) 
Change-Id: I9110d983c0ca6610075bd24975f1e90d123ef9c1
 2014-10-28 15:56:29 -07:00
Sanket Padawe
52f811ecda Merge "Remove checks to support new sim color selection." into lmp-mr1-dev 2014-10-28 22:47:09 +00:00
Alan Viverette
4bf9edfc1f Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 2014-10-28 22:45:33 +00:00
Yorke Lee
e398db4a45 Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev 2014-10-28 22:08:51 +00:00
Yorke Lee
7c72c2d3c2 Add comment to TelecomManager.getCallState 
Explain why READ_PHONE_STATE permission is not required so that
people don't try to add it in the future. Requiring the permission
causes stability crashes with legacy apps and system components
that don't have the permission.

Change-Id: Idf8766aa409d4a2c4ed3d6f81a398f4a0eb24615
 2014-10-28 14:12:02 -07:00
Adrian Roos
579a7f9940 Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 2014-10-28 20:27:41 +00:00
Sanket Padawe
d95198eb36 Remove checks to support new sim color selection. 
Remove checks to support new sim color selection in multi-sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
 2014-10-28 13:06:08 -07:00
John Spurlock
2896517ba1 Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev 2014-10-28 20:04:20 +00:00
Santos Cordon
ccbc3e5c66 Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev 2014-10-28 20:01:01 +00:00
Jeff Davidson
f82b029c7c Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 2014-10-28 20:00:32 +00:00
John Spurlock
9c4b060e41 Zen: Fix quantity format specifiers for quantity=1. 
Bug: 16824863
Change-Id: I3c7fc5961cd65b0b8291b7d9aef6110e6dfe85f1
 2014-10-28 15:49:25 -04:00
Joe Fernandez
9513604cdc am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
automerge: 56a8cb7

* commit '56a8cb7fd1eff26da30c4ebcb58eae71b9774b81':
  docs: Update timing of Android Wear app review
 2014-10-28 19:28:36 +00:00
David Friedman
79c332a694 am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
automerge: b648cab

* commit 'b648cabadfd73bcd3fa8b88db48007f58739300e':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 19:27:37 +00:00
Eric Gilmore
3fc61015f5 am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
automerge: 77760e7

* commit '77760e753eb9a6c533eb2b52f228149e49356f64':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 19:26:43 +00:00
Quddus Chong
50631f97b4 am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
automerge: eb07af2

* commit 'eb07af2ced7aa438dca941fcde2e3ca0b338a620':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 19:25:57 +00:00
Ricardo Cervera
989f4bfd8d am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents 
automerge: be07f2a

* commit 'be07f2a853cb2a69eeecbd7b0d68f455b55edae6':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:25:10 +00:00
Joe Fernandez
56a8cb7fd1 am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
* commit '5c0ed74b3886c5765c576e9e427b93c76b37635a':
  docs: Update timing of Android Wear app review
 2014-10-28 19:22:45 +00:00
David Friedman
b648cabadf am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
* commit 'b2d582d995622cc8379603cfadae7ee6d4163b3e':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 19:22:40 +00:00
Eric Gilmore
77760e753e am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
* commit '9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 19:22:37 +00:00
Quddus Chong
eb07af2ced am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
* commit '6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 19:22:15 +00:00
Ricardo Cervera
be07f2a853 am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents 
* commit 'f4e32145a214b28522d67e748c0eff74aa915bf6':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:22:11 +00:00
Jason Monk
8c01dfc5af Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev 2014-10-28 18:45:34 +00:00
Jason Monk
09895be87e Merge "Add hotspot icon to status bar" into lmp-mr1-dev 2014-10-28 18:27:06 +00:00
Shishir Agrawal
1ae88e3420 Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37 
The change above deleted these lines by mistake.

Bug: 18153840
Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
 2014-10-28 11:19:14 -07:00
Joe Fernandez
5c0ed74b38 am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
* commit '40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
  docs: Update timing of Android Wear app review
 2014-10-28 18:15:33 +00:00
David Friedman
b2d582d995 am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
* commit '3c00bc01f9c6e82a0859201f74237998b24872da':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 18:15:28 +00:00
Eric Gilmore
9a6aa0ffa4 am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
* commit 'd126294a8f954fb758d3f67bc5271014748ba9e7':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 18:15:24 +00:00
Quddus Chong
6face8a04c am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
* commit '2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 18:15:20 +00:00
Ricardo Cervera
f4e32145a2 am 61fcad92: docs: Add SearchXonY to Common Intents 
* commit '61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
  docs: Add SearchXonY to Common Intents
 2014-10-28 18:15:17 +00:00
Jason Monk
5d325074b1 QS: Bring back BT/Wi-Fi sub-panels 
Bluetooth has stayed pretty much the same, just came back.

Wi-Fi now shows the currently available networks like settings does.
Networks that require extra steps are taken to Settings to complete
the process.

Bug: 17722817
Change-Id: Idfcfd92f557b20168693ced26d4001f3708f08a4
 2014-10-28 13:43:04 -04:00
Adam Lesinski
31b76b66b1 Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 2014-10-28 17:41:12 +00:00
John Spurlock
ee990413b5 Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 2014-10-28 17:08:43 +00:00
Santos Cordon
32c65a548c Update javadocs for Telecom APIs. 
Bug: 18142177
Change-Id: I78461f3634d281a6927cec9c555825a1bdab7a24
 2014-10-28 10:03:57 -07:00
George Mount
95d520f160 Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 2014-10-28 17:01:25 +00:00
George Mount
45b701085b Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 2014-10-28 17:00:43 +00:00
John Spurlock
c90e6fe863 Zen: Show "(until 4:56 PM)" in exit conditions. 
Implement two-line exit conditions, display the duration + end
time on separate lines.

Bug: 16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
 2014-10-28 12:57:43 -04:00
Adrian Roos
2d1ef3012c Close keyguard user switcher on tap outside 
Also closes when tapping the current user.
Also fixes a bug, where the background alpha was
not properly initialized. And while we're at it,
fixes a bug where the user switcher was closable
in simple mode by extending quick settings.

Bug: 17691134
Change-Id: I5444fe42a8a2887ab012ef6cbdcc57ba81a8c1c2
 2014-10-28 17:46:03 +01:00
Nicolas Prevot
ebee8a4d92 Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 2014-10-28 16:33:33 +00:00