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
Geoff Mendal
7e23b3e7e1 Merge "Import translations. DO NOT MERGE" 2014-11-17 21:32:27 +00:00
Bernhard Rosenkränzer
3b1e22e289 Fix check for PROC_QUOTES mode 
Since != has priority over &, the "if ((mode&PROC_QUOTES != 0))" check
is the same as "if (mode & (PROC_QUOTES!=0))" - not what the code
intends.

Change-Id: I14840a887f26c28f2bd0aee8704c79cf353164ad
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 22:30:56 +01:00
Geoff Mendal
f18053c61b Merge "Import translations. DO NOT MERGE" 2014-11-17 21:30:05 +00:00
Craig Stout
36fbc43787 Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev 2014-11-17 21:28:25 +00:00
Geoff Mendal
add7c6714e Merge "Import translations. DO NOT MERGE" 2014-11-17 21:26:48 +00:00
Geoff Mendal
25222153fc Import translations. DO NOT MERGE 
Change-Id: I16b3f82e2a714a9923536d48878b83c7386db088
Auto-generated-cl: translation import
 2014-11-17 13:19:38 -08:00
Geoff Mendal
ac2c9a15e5 Import translations. DO NOT MERGE 
Change-Id: Idfdb35f8cbf2fb5797e2a0934d1c8df4aa8bf671
Auto-generated-cl: translation import
 2014-11-17 13:17:55 -08:00
Geoff Mendal
4e214b0399 Import translations. DO NOT MERGE 
Change-Id: I8dba08bbfd5fa95d472a82968b1bf16a756d7504
Auto-generated-cl: translation import
 2014-11-17 13:10:15 -08:00
Christopher Tate
889de0b459 am f75301f7: am 93fb1553: am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev 
* commit 'f75301f7b1c75207824fd7d9aab0f5936cb6e3ed':
  Don't crash just because invalid datasets were offered for restore
 2014-11-17 21:09:58 +00:00
Geoff Mendal
44e4ff746a Import translations. DO NOT MERGE 
Change-Id: I67abea60870f468d3ad9a6be7ee600de99b8ff54
Auto-generated-cl: translation import
 2014-11-17 13:07:17 -08:00
Christopher Tate
f75301f7b1 am 93fb1553: am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev 
* commit '93fb155344e076d7ac2dfc5570c8d560c206ae0e':
  Don't crash just because invalid datasets were offered for restore
 2014-11-17 21:05:10 +00:00
Geoff Mendal
31f6aaf48c am 5b5f6ddf: (-s ours) am cf71886c: (-s ours) am 9d8c7598: (-s ours) am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5b5f6ddfa84ec9e90c8b77899bb1a6096d1b1c56':
  Import translations. DO NOT MERGE
 2014-11-17 21:04:30 +00:00
Jeff Davidson
9a1da68bf7 Expose a SystemApi method to prepare a VPN without consent. 
This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.

The API requires a system-privileged permission, CONTROL_VPN.

Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7
 2014-11-17 21:03:10 +00:00
Geoff Mendal
6b4b851c38 Import translations. DO NOT MERGE 
Change-Id: Ia455f5ceec1e3c7d2c646e0f2ff252683ec46201
Auto-generated-cl: translation import
 2014-11-17 13:02:56 -08:00
Jeff Davidson
e0cb56b02e Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 2014-11-17 21:02:10 +00:00
Bernhard Rosenkränzer
92ddfcfff5 Fix incorrect usage of bool 
A bool can't be < 0

Change-Id: Ie94ffadcb38c95214d1105c02610e59b4b2872b2
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 22:01:27 +01:00
Geoff Mendal
5b5f6ddfa8 am cf71886c: (-s ours) am 9d8c7598: (-s ours) am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'cf71886c2f66bc45d33b23b1fa504d1cf249fa30':
  Import translations. DO NOT MERGE
 2014-11-17 21:00:43 +00:00
Christopher Tate
93fb155344 am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev 
* commit '94d963381d7bd75e60da1c3038c7970e47d2ac35':
  Don't crash just because invalid datasets were offered for restore
 2014-11-17 20:59:46 +00:00
Rob Tsuk
a5f2e07074 Fix uninitialized member warning 
The fact that mHasDeferredTranslate was unitialized couldn't cause any
problems, since mTranslateX and mTranslateY are intialized to zero and
the only use of mHasDeferredTranslate, in
DisplayListRenderer::flushTranslate(), doesn't do anything if those
values are both zero and then sets mHasDeferredTranslate to false.

Change-Id: Ia5aa2590b3ab956eaf74c90515353600253873f5
 2014-11-17 12:57:32 -08:00
Geoff Mendal
cf71886c2f am 9d8c7598: (-s ours) am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9d8c759879b7d56a7bf1678f7f1a1a8807ce5636':
  Import translations. DO NOT MERGE
 2014-11-17 20:55:25 +00:00
Geoff Mendal
02f5274606 Import translations. DO NOT MERGE 
Change-Id: I46f785bafa15445927a46f2a3fa31b659cae5492
Auto-generated-cl: translation import
 2014-11-17 12:52:20 -08:00
Geoff Mendal
6686e4c160 Import translations. DO NOT MERGE 
Change-Id: I46c698b3cdfd5292e267a3abe8e10e35cb856548
Auto-generated-cl: translation import
 2014-11-17 12:47:27 -08:00
Craig Stout
9eef7bce56 Use dark theme for usb dialogs on television. 
b/16488215

Change-Id: I8ea2a184b2df36e3f55ba5bd0e8fb121ef0ed48e
 2014-11-17 12:36:15 -08:00
John Reck
c99d3c99f8 Fix invalidateOutline 
Bug: 18175261

invalidateOutline was switched to a lazy-method, but this doesn't
work because invalidateViewProperty intentionally does not
do a traversal, therefore the invalidate was never consumed.

However it was attempting to be lazy about work that is cheap to
do, so nuke the lazy aspect and restore invalidateOutline's previous,
correct behavior. rebuildOutline is kept to avoid triggering
traversals in places they are not needed

Change-Id: I70f8cbacd54a607c0bf0bc7fe6eea78554cb2ea3
 2014-11-17 12:35:53 -08:00
Raph Levien
396879f3f8 Fix missing ellipsis when just one character is truncated 
The "moreChars" test in StaticLayout's generate method would evaluate to
false when the last character in a word caused the break. This in turn
suppressed the ellipsis in this case. The proposed fix is always to set
moreChars true in the code path where the line is broken because more
text wouldn't fit.

Bug: 17738112
Change-Id: Ifa1a69841ca952da4d1937dc8326778179b026b3
 2014-11-17 12:32:06 -08:00
Geoff Mendal
9ecba4e7d5 am e4775101: (-s ours) am e8e6b933: (-s ours) am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e477510104f7a31650974b827bab3ebdaf7b5427':
  Import translations. DO NOT MERGE
 2014-11-17 20:27:46 +00:00
Geoff Mendal
44249871d0 am 961a5836: (-s ours) am 65588053: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '961a5836314cfb18c20002dd46d7c31776d9ce03':
  Import translations. DO NOT MERGE
 2014-11-17 20:27:37 +00:00
Adam Lesinski
d97237071d am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge 
* commit '11bdd5b10b5f921b657283fa94463263171218d5':
  Implement back-tracking when searching for attributes in XML or resource bag
 2014-11-17 20:27:32 +00:00
Jim Miller
e45f1cc3a7 am a9a3e248: am 58b9ee28: am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev 
* commit 'a9a3e24835b08828aa252bf079067a5f810a0792':
  Fix deadlock caused by synchronous setOccluded() method in keyguard
 2014-11-17 20:27:26 +00:00
Wale Ogunwale
557cb43886 am b723931b: am 58cdb919: am 465e9967: Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 
* commit 'b723931b88f9e30db47c2776db2474e0b2f71ca1':
  Consolidated processing of package boardcasts in AM service.
 2014-11-17 20:27:21 +00:00
Ricardo Cervera-Navarro
d2095fc8ce am e663434a: am af56f979: am b04c3d62: am bb987493: am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit 'e663434a6f8051967a108c312773757233985d21':
  docs:eclipse-migrate update
 2014-11-17 20:27:17 +00:00
Jorim Jaggi
b64ca1a6db am 88a71669: am dd907b1a: am 6a388ef8: Merge "Don\'t play hint animation when touching to wake up" into lmp-mr1-dev 
* commit '88a7166944d6f7afd345a72619e06ee20d245958':
  Don't play hint animation when touching to wake up
 2014-11-17 20:27:12 +00:00
Jorim Jaggi
72bb36f575 am 77979f23: am 477226bb: am da5a2863: Merge "Always set correct policy visibility" into lmp-mr1-dev 
* commit '77979f23bd3971dbf20a31f65a7b3445ad2f0ce8':
  Always set correct policy visibility
 2014-11-17 20:27:08 +00:00
Stuart Scott
0c29f1b832 am a7697fa8: am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev 
* commit 'a7697fa81fc0682494a80e0435cb47c38ad7cbe7':
  Updating Subscription Info Icon
 2014-11-17 20:27:03 +00:00
Ying Wang
124852afe2 am 0fcf24e6: am 753eda5b: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" 
* commit '0fcf24e6b03386f16711a1507c7ef26122ab3b8f':
  Frameworks/base: AndroidRuntime standalone preloaded-classes
 2014-11-17 20:26:42 +00:00
Ying Wang
8a6c8cae3d am 0cba972c: am d141a903: Merge "Move preloaded-classes out of framework.jar." 
* commit '0cba972c4038b3c9d88fcf30f31e7005b69c9df8':
  Move preloaded-classes out of framework.jar.
 2014-11-17 20:26:37 +00:00
Geoff Mendal
e477510104 am e8e6b933: (-s ours) am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e8e6b933a73f7ff23bd6c0880cc6d9b82bd4ec9e':
  Import translations. DO NOT MERGE
 2014-11-17 20:20:39 +00:00
Geoff Mendal
961a583631 am 65588053: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '65588053164fd51a69c5110c1e75c8712cd69e2c':
  Import translations. DO NOT MERGE
 2014-11-17 20:20:31 +00:00
Christopher Tate
94d963381d Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev 2014-11-17 20:20:12 +00:00
Adam Lesinski
11bdd5b10b Merge commit '06d8b7b8' into manualmerge 
Conflicts:
	core/jni/android_util_AssetManager.cpp

Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca
 2014-11-17 12:17:16 -08:00
Jim Miller
a9a3e24835 am 58b9ee28: am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev 
* commit '58b9ee28262a608853dbb1134b5a79cf7fdce502':
  Fix deadlock caused by synchronous setOccluded() method in keyguard
 2014-11-17 19:53:46 +00:00
Wale Ogunwale
b723931b88 am 58cdb919: am 465e9967: Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 
* commit '58cdb919d1e7d6aa6fd066c22a457388c23982b0':
  Consolidated processing of package boardcasts in AM service.
 2014-11-17 19:53:40 +00:00
Ricardo Cervera-Navarro
e663434a6f am af56f979: am b04c3d62: am bb987493: am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit 'af56f97973752194b318b7d88646021319f118ad':
  docs:eclipse-migrate update
 2014-11-17 19:53:34 +00:00
Jorim Jaggi
88a7166944 am dd907b1a: am 6a388ef8: Merge "Don\'t play hint animation when touching to wake up" into lmp-mr1-dev 
* commit 'dd907b1a94bdd601051da84c2a414251222098b3':
  Don't play hint animation when touching to wake up
 2014-11-17 19:53:28 +00:00
Jorim Jaggi
77979f23bd am 477226bb: am da5a2863: Merge "Always set correct policy visibility" into lmp-mr1-dev 
* commit '477226bb63fa357b26a71abd3e9209659efdb337':
  Always set correct policy visibility
 2014-11-17 19:53:22 +00:00
Stuart Scott
a7697fa81f am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev 
* commit '343a88da1b93642f8d8b75f7de43918378b573f8':
  Updating Subscription Info Icon
 2014-11-17 19:53:16 +00:00
Geoff Mendal
9d8c759879 am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '27b8033175a748438891dc9da498ff354cce82a0':
  Import translations. DO NOT MERGE
 2014-11-17 19:51:34 +00:00
Ying Wang
0fcf24e6b0 am 753eda5b: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" 
* commit '753eda5b39882716a3eafc2162cedd89051ea06a':
  Frameworks/base: AndroidRuntime standalone preloaded-classes
 2014-11-17 19:48:23 +00:00
Ying Wang
0cba972c40 am d141a903: Merge "Move preloaded-classes out of framework.jar." 
* commit 'd141a9033bd3e6cf77bd31c914bc71b0afee92aa':
  Move preloaded-classes out of framework.jar.
 2014-11-17 19:48:16 +00:00
Geoff Mendal
e8e6b933a7 am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c81a3e16e77c83d30395d36dc907cbef80dd7ac6':
  Import translations. DO NOT MERGE
 2014-11-17 19:48:07 +00:00