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

164454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
568039dda6 Import translations. DO NOT MERGE 
Change-Id: I488ba02367861ca1c84acd44e1a7aaee31e71108
Auto-generated-cl: translation import
 2015-04-01 02:46:18 -07:00
Andrew Solovay
d0609d1cb4 docs: Fixed formatting in android:documentLaunchMode syntax section 
Also fixed the line breaks in android:configChanges so the syntax
code box doesn't need a horizontal scroll bar.

See first comment for doc stage location.

bug: 19935160
Change-Id: I1ec34473e743a9f0c921f771cfb47129c47f9014
 2015-03-31 21:02:44 -07:00
Andrew Solovay
b2255d4f10 docs: Fixed a typo. 
See first comment for doc stage location.

bug: 19709151
Change-Id: I182cb76c55acd32da921420b3ef37d330cf63bb0
 2015-03-31 20:13:57 -07:00
Rich Slogar
19f75fd71e docs: systrace update 
Change-Id: I693f6b3eef32a412dd1764d39706dcebef9e000c
 2015-03-31 16:14:51 -07:00
Kenny Root
4999b175e9 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 19:10:50 +00:00
Svetoslav
13d8e41d3a am c6be7545: am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit 'c6be7545b4106b9ba586e365f2d2ab911cafea93':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:41:00 +00:00
Kenny Root
a7645df597 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 16:40:15 +00:00
Svetoslav
c6be7545b4 am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
* commit '37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
  AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
 2015-03-31 16:33:21 +00:00
Kenny Root
9a7c1a3549 Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE 
This reverts commit 693ea60e9e3d2ef476e4f45caac234360d90bdb9.

Bug: 19894176
Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b
 2015-03-31 09:15:40 -07:00
Kenny Root
9eed9e962c Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE 
This reverts commit 4ff668d47ab9f49ec81606aec6d469ecd6ca37fa.

Bug: 19894176
Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd
 2015-03-31 09:15:37 -07:00
Andreas Gampe
74ad30f969 Frameworks/base: Support dex2oat threads system property 
Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.

Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.

Bug: 19992386

(cherry picked from commit e0352388238875ef7e7b31d914fc903b08ff0f6b)

Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
 2015-03-30 21:05:12 -07:00
Svetoslav
37661db7fa AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE 
AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.

bug:16954787

Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
(cherry picked from commit 5738fec00db65e0ee246475a7236e57ba3ee8d55)
 2015-03-31 01:25:35 +00:00
Rich Slogar
400fd04fa1 am b1dc614d: am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 
* commit 'b1dc614d151a90e8745964157f0f7bc2c145894f':
  docs: build tools 22.0.1 revision updates
 2015-03-30 21:37:05 +00:00
Rich Slogar
b1dc614d15 am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 
* commit 'f80370c60118441c0022333a5b4f8cda99c86774':
  docs: build tools 22.0.1 revision updates
 2015-03-30 21:30:39 +00:00
Rich Slogar
f80370c601 Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 2015-03-30 21:24:20 +00:00
Luan Nguyen
e42aa1caf0 docs: Update ambient mode to mention disabling bitmap filtering 
bug: 19429396
Change-Id: I51c1c58211cbdcb8c293b693627c659fd55537cf
 2015-03-30 15:45:55 +00:00
Luan Nguyen
7eecdd553a docs: Remove note about inablity to submit apps to Google Play. 
Change-Id: I15577e02ac4a4fed247209f9115439dc4216018e
 2015-03-30 15:44:08 +00:00
Geoff Mendal
6e6250b961 Import translations. DO NOT MERGE 
Change-Id: I386da39a3fc78ac9e7878f8962bb4a513d907893
Auto-generated-cl: translation import
 2015-03-30 07:38:42 -07:00
Bart Sears
c03cfc9d86 am d4c3ef87: am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 
* commit 'd4c3ef87f8aaef9eb5ec66856dffc9eca5537573':
  CEC: Explicitly turn on screen for remote control passthrough
 2015-03-27 21:23:01 +00:00
Bart Sears
d4c3ef87f8 am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 
* commit '4a26c391d08dfa6a3c189293f0fc163b817b1b49':
  CEC: Explicitly turn on screen for remote control passthrough
 2015-03-27 21:14:37 +00:00
Bart Sears
4a26c391d0 Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 2015-03-27 20:48:38 +00:00
Deepanshu Gupta
fb37c97c25 am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '61bb0b4f58f794ff468f2cfaf958cb5cc0b09026':
  Fix tests for Java 6.
 2015-03-27 02:58:47 +00:00
Christopher Tate
63862a2052 am 7b73a788: am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit '7b73a788f0c18a31de729daa51e7e06286cf7609':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 02:58:40 +00:00
Deepanshu Gupta
61bb0b4f58 am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '4e6ae02a29dd432648a81f3803f3ccf712621d43':
  Fix tests for Java 6.
 2015-03-27 02:49:27 +00:00
Christopher Tate
7b73a788f0 am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit 'dbe0dd160e93feef1335830a36e86ae83b19b793':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 02:49:23 +00:00
Deepanshu Gupta
4e6ae02a29 am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '17bb697b3bce1b23137553829dd62e0e7c16b472':
  Fix tests for Java 6.
 2015-03-27 01:09:53 +00:00
Deepanshu Gupta
17bb697b3b am ec8df9af: Fix tests for Java 6. 
* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.
 2015-03-27 01:02:58 +00:00
Michael Runge
0f9b70159a am 9e3976b6: am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '9e3976b6feba28b027122af25b21c9eca6705f0f':
  Increase timeout when uncrypting OTA
 2015-03-27 00:50:41 +00:00
Amith Yamasani
a5c20b98cd am c704bc64: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit 'c704bc647270c30b5c38d53d10228325befeb0b7':
 2015-03-27 00:50:33 +00:00
Deepanshu Gupta
fc18e950bf am cfdd1e18: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'cfdd1e18a8039b8c0b1c1f260018cac3a613c3ec':
 2015-03-27 00:50:27 +00:00
Deepanshu Gupta
836f5d986f am 85afc992: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '85afc992ea0058155c73b2ad06f130df7bc697f4':
 2015-03-27 00:50:19 +00:00
Deepanshu Gupta
18755bfa3e am 0c8ccefc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit '0c8ccefc54f4ddb2cc91df093bc09bd4ac8a1215':
 2015-03-27 00:50:00 +00:00
Deepanshu Gupta
7a5a976c9e am c07448d2: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit 'c07448d22ccc802acef341684d182898b6d449b6':
 2015-03-27 00:49:53 +00:00
Deepanshu Gupta
02e11a595e am 75614212: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '75614212d44c6874d5c7af1e7611566979b3471f':
 2015-03-27 00:49:46 +00:00
Deepanshu Gupta
173e931d45 am 5bbc0265: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '5bbc026536f460c90f17f4554bad554f72df0009':
 2015-03-27 00:49:40 +00:00
Jeff Brown
a15ce03ee7 am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit '64646defa7d01ca4105a5da8cc8d0999dac1543d':
 2015-03-27 00:49:33 +00:00
Michael Runge
9e3976b6fe am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '9a91bf1d18d3855b4bdaaa613fa10372da6e530e':
  Increase timeout when uncrypting OTA
 2015-03-27 00:35:12 +00:00
Amith Yamasani
c704bc6472 am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit '0afd1905b59446fc471680325bcbea802bb37c5c':
  Fix NPE if FPE service does not exist.
 2015-03-27 00:35:00 +00:00
Deepanshu Gupta
cfdd1e18a8 am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.
 2015-03-27 00:34:21 +00:00
Deepanshu Gupta
85afc992ea am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]
 2015-03-27 00:34:12 +00:00
Deepanshu Gupta
0c8ccefc54 am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.
 2015-03-27 00:34:01 +00:00
Deepanshu Gupta
c07448d22c am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.
 2015-03-27 00:33:56 +00:00
Deepanshu Gupta
75614212d4 am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.
 2015-03-27 00:33:52 +00:00
Deepanshu Gupta
5bbc026536 am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.
 2015-03-27 00:33:47 +00:00
Jeff Brown
64646defa7 am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.
 2015-03-27 00:33:21 +00:00
Christopher Tate
dbe0dd160e When scanning unbundled apps, only install the expected APK tree 
We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state.  When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.

Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.

Bug 19602471

Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
 2015-03-26 15:55:30 -07:00
Rich Slogar
cdd3eea3dd docs: nexus usb driver update 
b.android 161504

Change-Id: I458f49b5cdbd6a8886054f95d240b0611c79018c
 2015-03-26 15:17:58 -07:00
Deepanshu Gupta
ec8df9af2f Fix tests for Java 6. 
- Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
 2015-03-26 12:29:36 -07:00
Junichi Monma
ce8a9f53b2 Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test. 
bug id : b/19938983

Change-Id: I7568bb9c41b90a57f2e3b89d3fa694ef692f05ac
 2015-03-26 22:54:21 +09:00
Michael Runge
9a91bf1d18 am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
  Increase timeout when uncrypting OTA
 2015-03-26 04:08:24 +00:00