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

176117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
93b3d66587 am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '7818f205e5b18d8d7fddcf01736d546cb08bfd62':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:29:28 +00:00
Yuichi Araki
428c2fa0f8 am c3fbf13d: am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'c3fbf13d525a0bcf1202618b197f4160750b54f1':
  Fix a broken link in javadoc
 2015-04-02 20:29:24 +00:00
Andrew Solovay
7818f205e5 am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f99a16c943a4366bdfdba19534457f9e45538f7d':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:19:15 +00:00
Yuichi Araki
c3fbf13d52 am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'e2fc3adbb4040400496aebdab80c4cac1083da27':
  Fix a broken link in javadoc
 2015-04-02 20:19:09 +00:00
Andrew Solovay
f99a16c943 am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '589a272e97d1f24abee1bdfce18ab88cbd5f12a9':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:10:55 +00:00
Yuichi Araki
e2fc3adbb4 am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit '61ce6c9b705e41800662b33601c01a4848c174d3':
  Fix a broken link in javadoc
 2015-04-02 20:10:48 +00:00
Andrew Solovay
589a272e97 am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 19:56:41 +00:00
Yuichi Araki
61ce6c9b70 am 776cf41d: Fix a broken link in javadoc 
* commit '776cf41d7c8f239d20397886f2120407396cfc87':
  Fix a broken link in javadoc
 2015-04-02 19:56:35 +00:00
Andrew Solovay
f2ff12ba00 Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 2015-04-02 19:25:25 +00:00
Olawale Ogunwale
65073b910c am 9987b6e8: am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity." 
* commit '9987b6e867d862c27cd1339d7fa8135b75d565f1':
  [ActivityManager] Avoid improper resume top activity.
 2015-04-02 17:10:51 +00:00
Olawale Ogunwale
9987b6e867 am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity." 
* commit 'e4d4e22f26bfd36a553fb24232d2fd4ddf4fc907':
  [ActivityManager] Avoid improper resume top activity.
 2015-04-02 17:00:12 +00:00
Olawale Ogunwale
e4d4e22f26 Merge "[ActivityManager] Avoid improper resume top activity." 2015-04-02 16:39:18 +00:00
riddle_hsu
558e849a77 [ActivityManager] Avoid improper resume top activity. 
When there is a process died, only resume top if
it contains visible activity.

This can fix case 1 in
https://android-review.googlesource.com/#/c/120901/

Change-Id: I45584e76f9e863980d04bbb593d7d26a8900acd0
 2015-04-02 16:43:13 +08:00
Yuichi Araki
776cf41d7c Fix a broken link in javadoc 
Bug: 19856130

Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
 2015-04-02 04:03:07 +00:00
Eric Gilmore
82a7e2a8dd am a16d42cd: am 7278d89c: am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit 'a16d42cd4ff9ed66eda1d9b983058b598e7b60d1':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 02:33:33 +00:00
Elliott Hughes
095428d262 am d15958f6: am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late" 
* commit 'd15958f661c8748b811e6b12642321f4e47f2817':
  Early return in RemoteViewsAdapter is too late
 2015-04-02 02:33:15 +00:00
Eric Gilmore
a16d42cd4f am 7278d89c: am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit '7278d89c1b51bc937e79021eae523dfd0f3d30a1':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 01:31:30 +00:00
Elliott Hughes
d15958f661 am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late" 
* commit '64c8a07345cb7cb01b3e98442b52c51d473fbf2d':
  Early return in RemoteViewsAdapter is too late
 2015-04-02 01:13:09 +00:00
Eric Gilmore
7278d89c1b am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit 'f2204720eac6fd959eb5a3732c0084636bc16095':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 01:06:52 +00:00
Eric Gilmore
f2204720ea am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit 'b2b93762b8165ee47f49765816fc7ba0428c371c':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 00:59:34 +00:00
Elliott Hughes
64c8a07345 Merge "Early return in RemoteViewsAdapter is too late" 2015-04-01 23:34:25 +00:00
Eric Gilmore
b2b93762b8 Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 2015-04-01 23:13:26 +00:00
Scott Rowe
bb18c2d4ab am 0f2f0350: am 5f78af44: am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit '0f2f03506654e6669db64147e9f22340c24629e8':
  docs: Building Live TV Apps
 2015-04-01 21:58:23 +00:00
Scott Rowe
0f2f035066 am 5f78af44: am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit '5f78af44bd9627dace7db4ce47fdf61cf8d78b42':
  docs: Building Live TV Apps
 2015-04-01 21:46:45 +00:00
Scott Rowe
5f78af44bd am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit 'a03245a343fe7906e4459b6a4dfcc41f60c56fd6':
  docs: Building Live TV Apps
 2015-04-01 21:35:39 +00:00
Scott Rowe
a03245a343 am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit '4fc3d3ff404c777e07616b704c68176d9060c4e4':
  docs: Building Live TV Apps
 2015-04-01 21:25:53 +00:00
Scott Rowe
4fc3d3ff40 Merge "docs: Building Live TV Apps" into lmp-docs 2015-04-01 21:05:42 +00:00
Alex Klyubin
261e7a37df am 39b99186: am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString." 
* commit '39b9918631061340361b7776ace9b9cd4b25be7c':
  Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
 2015-04-01 20:48:17 +00:00
Alex Klyubin
39b9918631 am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString." 
* commit '97467d82a31964e36cb6bc32ac4cf00e884c190e':
  Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
 2015-04-01 20:38:07 +00:00
Alex Klyubin
66b96b5977 am 78014a78: am 04047af6: Merge "Use Keymaster-friendly validity dates." 
* commit '78014a78155ad05ca2e0af600c0545377c04bdbd':
  Use Keymaster-friendly validity dates.
 2015-04-01 20:31:42 +00:00
Alex Klyubin
78014a7815 am 04047af6: Merge "Use Keymaster-friendly validity dates." 
* commit '04047af628338aa7859ae1f24700e1e4e3ae63e7':
  Use Keymaster-friendly validity dates.
 2015-04-01 20:21:00 +00:00
Andreas Gampe
844e44c96d am 7598a248: am e816f917: Merge "Frameworks/base: Use system property for cache prune counter" 
* commit '7598a248bdbeb58a4b40ad773f39137b0dde1137':
  Frameworks/base: Use system property for cache prune counter
 2015-04-01 20:15:59 +00:00
Luan Nguyen
51d58c9f21 am e5bc03da: am d7fe75d6: am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit 'e5bc03da07489d603df4e02754e061b37b5978d0':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 20:15:55 +00:00
Alex Klyubin
97467d82a3 Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString." 2015-04-01 20:15:53 +00:00
Luan Nguyen
fa0842fc24 am 0c50a4f1: am 13803e43: am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '0c50a4f15cdd120eae331545888982dccdb7b8aa':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 20:15:50 +00:00
Luan Nguyen
9c0dbf4093 am b79d9912: am b9b2801d: am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit 'b79d9912c7f54ca5c5f496753ee4a316e78ac17b':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 20:15:46 +00:00
Andreas Gampe
7598a248bd am e816f917: Merge "Frameworks/base: Use system property for cache prune counter" 
* commit 'e816f917e0e1c21c8019436744284630f2408dc0':
  Frameworks/base: Use system property for cache prune counter
 2015-04-01 20:10:22 +00:00
Alex Klyubin
3f24a1d94a Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString. 
This makes the hidden API android.net.Uri.toSafeString omit most parts
of HTTP, HTTPS, and FTP URLs to avoid leaking anything unsafe. Only
the host and port are retained for these URLs.

Bug: 19215516
Change-Id: I2e9e33d9afaa9de5dd07a40532d56f0a2179f62a
 2015-04-01 13:09:22 -07:00
Luan Nguyen
e5bc03da07 am d7fe75d6: am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit 'd7fe75d687935060557920ff2e515b7246958405':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 20:05:17 +00:00
Luan Nguyen
0c50a4f15c am 13803e43: am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '13803e43b3196378d26fac8104d211b1224cb9f1':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 20:05:11 +00:00
Luan Nguyen
b79d9912c7 am b9b2801d: am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit 'b9b2801da423a1ce79b8738ef7ce8d8a6e4e8532':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 20:05:05 +00:00
Alex Klyubin
04047af628 Merge "Use Keymaster-friendly validity dates." 2015-04-01 20:01:00 +00:00
Luan Nguyen
d7fe75d687 am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit '92aa846daf64119d5951453c0298f83115f26d48':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 19:55:08 +00:00
Luan Nguyen
13803e43b3 am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '03bafac781492fed392cb6bcdc8773a44076c705':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 19:55:02 +00:00
Luan Nguyen
b9b2801da4 am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit 'b2bd8f8ac8405beaa5b531d1e23256315d7555bc':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 19:54:52 +00:00
Andreas Gampe
e816f917e0 Merge "Frameworks/base: Use system property for cache prune counter" 2015-04-01 19:52:27 +00:00
Andreas Gampe
e324ba0e7c Frameworks/base: Use system property for cache prune counter 
Expose ART's -Xzygote-max-boot-retry through a new system property
dalvik.vm.zygote.max-boot-retry.

Bug: 19983101
Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
 2015-04-01 19:50:58 +00:00
Luan Nguyen
92aa846daf am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 
* commit 'd01ada25155ed82644b9cc23313c04d3f1a5721a':
  docs: Update ambient mode to mention disabling bitmap filtering
 2015-04-01 19:43:57 +00:00
Luan Nguyen
03bafac781 am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 
* commit '649d839b82a8fafc99ae79ba1ad5fc12218391cb':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
 2015-04-01 19:43:54 +00:00
Luan Nguyen
b2bd8f8ac8 am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 
* commit '7542c44ee45a195404eccf50a82df7903e2ecd9c':
  docs: Add voice intent for starting a stopwatch
 2015-04-01 19:43:39 +00:00