Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,614 Commits 3 Branches 0 Tags
2b9d4cdcfb75a047c60fe8a09247bd54e52a5016
Commit Graph

44848 Commits

Author SHA1 Message Date
Winson Chung
2b9d4cdcfb am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
automerge: a4fe261

* commit 'a4fe261ec0d8ea9a820a30ea696498c6d5a2f2d4':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:27:29 +00:00
Winson Chung
a4fe261ec0 am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit '9f48e3160f2768d3322670cbbcc606c9eef76bad':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:26:16 +00:00
Winson Chung
9f48e3160f am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 
* commit 'e2ed349cfa838223160e83be7df144e2265cdce4':
  Removing context ref from AppWidgetHost. (Bug 18769791)
 2014-12-18 00:18:53 +00:00
Winson Chung
e2ed349cfa Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 2014-12-18 00:15:42 +00:00
Alan Viverette
8db231af04 Merge "Allow theme attributes in <include> tag, fix <tag> context" 2014-12-18 00:11:14 +00:00
Alan Viverette
33e3cdab5b Allow theme attributes in <include> tag, fix <tag> context 
BUG: 17658979
Change-Id: I79a55ee53bff5ea6efb04997973a9aa810ff0950
 2014-12-17 15:43:29 -08:00
Raph Levien
faf2190334 am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
automerge: d946753

* commit 'd946753aa4ac3ac9b16ff1627a19fb05f1608660':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:21:16 +00:00
Raph Levien
d946753aa4 am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
* commit '3ac280c93bdebe4ca698e9a2e3d6d2daf3598e7a':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:19:25 +00:00
Raph Levien
3ac280c93b am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 
* commit '078ce5fc820d4744f5b1af384e427cedb7e90643':
  Revert "Change Linkify leniency to VALID"
 2014-12-17 23:14:13 +00:00
Raph Levien
078ce5fc82 Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 2014-12-17 23:08:51 +00:00
Raph Levien
047e816fe2 Revert "Change Linkify leniency to VALID" 
This reverts commit 9dfe86d410.

That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).

The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.

Bug: 18708556
 2014-12-17 14:31:39 -08:00
Olawale Ogunwale
c946e92e6c am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" automerge: e3b07b4 
automerge: a230a43

* commit 'a230a43204e3567d93a2d914123b21c14bdf495d':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:55:05 +00:00
Olawale Ogunwale
a230a43204 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" 
automerge: e3b07b4

* commit 'e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:50:31 +00:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Jeff Davidson
1eb5ca609a am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 
automerge: 38e8763

* commit '38e8763df55ebedcf65178f8acced806113af4a5':
  Add global setting for ephemeral network timeout.
 2014-12-17 21:05:53 +00:00
Jeff Davidson
38e8763df5 am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 
* commit '0b3718d6b157bf15db9d709d50019f81f06195b9':
  Add global setting for ephemeral network timeout.
 2014-12-17 20:58:44 +00:00
Jeff Davidson
0b3718d6b1 Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev 
automerge: cc4f183

* commit 'cc4f18309a2a576b282a399a97a9d64d66713b89':
  Add global setting for ephemeral network timeout.
 2014-12-17 20:52:19 +00:00
Jeff Davidson
cc4f18309a Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev 2014-12-17 20:51:12 +00:00
Jorim Jaggi
92c9be1c12 am 3a70523e: am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '3a70523eb63c4f61dcd6fcf52f1d9ebae7482027':
  Fix colored icons in doze mode
 2014-12-17 19:39:49 +00:00
Jorim Jaggi
3a70523eb6 am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '4a5129c83b92e7ae198f4b9a3018c8cdcba5dd86':
  Fix colored icons in doze mode
 2014-12-17 19:10:43 +00:00
Nicolas Prevot
743a68fc5f am 237637e2: am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev automerge: 47cbcd7 
* commit '237637e22ba9d98171f32d2302b9f532120729a9':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 19:07:50 +00:00
Winson Chung
7a96f3c917 Removing context ref from AppWidgetHost. (Bug 18769791) 
Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
 2014-12-17 11:07:24 -08:00
Jorim Jaggi
4a5129c83b am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit 'c3059b444fbd30b1344cd5ee3c7030d1e9e5c408':
  Fix colored icons in doze mode
 2014-12-17 19:04:42 +00:00
Nicolas Prevot
237637e22b am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 
automerge: 47cbcd7

* commit '47cbcd7740739796aef113646861ff7e79439a9c':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 19:01:18 +00:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Nicolas Prevot
47cbcd7740 am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 
* commit 'f2bd50b2ec0e5d7a25694170e0dc1363465fd24e':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 18:58:26 +00:00
Jorim Jaggi
92df1f2758 Fix colored icons in doze mode 
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
 2014-12-17 19:57:45 +01:00
Alan Viverette
acf874112a Merge "Revert "Allow theme attributes in <include> tag, fix <tag> context"" 2014-12-17 18:56:50 +00:00
Alan Viverette
a9783bffcc Revert "Allow theme attributes in <include> tag, fix <tag> context" 
This reverts commit 866180198a.

Change-Id: Ia77131bf78b53a4360c7fc36d295994119c296cc
 2014-12-17 18:56:32 +00:00
Nicolas Prevot
f2bd50b2ec Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 2014-12-17 18:54:55 +00:00
Jeff Sharkey
55950d5c76 Merge "Iterate based on index, not key." 2014-12-17 18:29:45 +00:00
Jeff Sharkey
c4ec5b633e Iterate based on index, not key. 
Bug: 18785949
Change-Id: I5d92fedac9f71b997f87f7035635fde276756faa
 2014-12-17 10:24:13 -08:00
Nicolas Prevot
fc7b444462 Fix the doc of addCrossProfileIntentFilter. 
Mention that cross-profile-intent-filters only work for activity intents.

BUG:18776618

Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
 2014-12-17 17:55:08 +00:00
Christoph Studer
58d080e1a2 am f3528480: am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit 'f35284804b4f04b91d772b913d9a6ae1c8a5f65a':
  Notification: Fix bigLargeIcon
 2014-12-17 15:30:02 +00:00
Christoph Studer
f35284804b am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit '1464dd2f925f4b6179a7ede287f13431e6835aec':
  Notification: Fix bigLargeIcon
 2014-12-17 15:23:48 +00:00
Christoph Studer
1464dd2f92 am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit '0b22e395d24cba14d4113fb326bfcb57c6aa5996':
  Notification: Fix bigLargeIcon
 2014-12-17 15:18:31 +00:00
Christoph Studer
0b22e395d2 Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 2014-12-17 15:14:03 +00:00
Jeff Davidson
a20ca67d94 Add global setting for ephemeral network timeout. 
Bug: 18637384
Change-Id: I6bde3c9eef12caf2cc51c449abffc1c69f60c17f
 2014-12-16 13:30:06 -08:00
Christopher Tate
e01429cc58 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
automerge: a8fe14a

* commit 'a8fe14a2116e68b22aa9f5d9aefb27e373dc4074':
  Turn debug flag off
 2014-12-16 20:38:31 +00:00
Christopher Tate
a8fe14a211 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
* commit '15626d3a493b5eb4c1fecb73f8d4fc18547c4c13':
  Turn debug flag off
 2014-12-16 20:34:37 +00:00
Christoph Studer
3f8140543e am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
automerge: 2bd62b5

* commit '2bd62b53b68834cabb48be608ee350012b1e8043':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:34:33 +00:00
Christoph Studer
2bd62b53b6 am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:31:53 +00:00
Christoph Studer
88fb463ea3 am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '0bb83b07d1602c1a99c938471edfc411a47dbffc':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:26:26 +00:00
Christoph Studer
0bb83b07d1 Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 2014-12-16 18:16:42 +00:00
Alan Viverette
b910bd7615 Merge "Allow theme attributes in <include> tag, fix <tag> context" 2014-12-16 18:01:26 +00:00
Andre Eisenbach
284e66e23c am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
automerge: 7ea97e2

* commit '7ea97e28e6a2271fd4d60c07b4fa83e019e3474a':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:30:33 +00:00
Andre Eisenbach
7ea97e28e6 am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'f6b62a9d913441cb400fc60f3187fc9c1f28dc97':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:27:46 +00:00
Andre Eisenbach
f6b62a9d91 am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'cd460538a4e00cd36be478b00d298a6e2526528f':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:21:13 +00:00
Benjamin Franz
c88b6bdcfa Don't send the onServiceDisconnected callback after close. 
Bug: 18667402
Change-Id: Ia029fd861d643f6646fb124d76ca2a1d2a1a695a
 2014-12-16 15:33:03 +00:00
mark_chen
89764e337b [ActivityManager] Use synchronized to protect object 
Symptom: ArrayIndexOutOfBoundsException at mResourcePackages
Root Cause: Race condition issue
Solution: Use synchronized to protect object

Change-Id: Ia2d89d50919d95d95f6f8ac2eb75594a93e8f2da
 2014-12-16 05:44:34 +00:00