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

147080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jae Seo
7a869cb61e am 4c61c0a4: am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager 
* commit '4c61c0a4e81cf01154ee94c4c30106ad41d637f9':
  TIF: Merge TvParentalControlManager into TvInputManager
 2014-07-30 16:42:53 +00:00
Jae Seo
d5d2893e44 am f38c8185: am af0f27fa: TIF: Use more consistent constant names 
* commit 'f38c81859b8015339b7c72fea088da5810cedefc':
  TIF: Use more consistent constant names
 2014-07-30 16:42:40 +00:00
Alan Viverette
351328416f am 81250206: am 719cc772: Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev 
* commit '81250206a84e8f34eee6b121e3f1a57cd1875b71':
  Revert "Update switch assets, fix SearchView asset 9-patch areas"
 2014-07-30 16:42:30 +00:00
Wonsik Kim
0e77c3e64e am af1ea61c: am d284bd57: TIF: ensure hardware / CEC event calling sequence 
* commit 'af1ea61c57de2685b4fa4b9237cf036c3b9f96be':
  TIF: ensure hardware / CEC event calling sequence
 2014-07-30 16:42:23 +00:00
Alan Viverette
2dedbc912d am b1d563b1: am cabeac83: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit 'b1d563b142b14a1b439fc96fd8f6b26fc4fdc262':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 16:41:59 +00:00
Dirk Dougherty
7fd639f22e am d593f43a: am 33bf37c6: am 78ad92b4: am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit 'd593f43a749afe4016d429cbe67219630b7e02be':
  Doc change: add notice for admob sdk upgrade.
 2014-07-30 16:40:14 +00:00
Aravind Akella
9be5ef8dba am 05f855b4: am 1fde001f: Merge "SensorManager API changes." into lmp-dev 
* commit '05f855b44c5a5f53f4a8416bfd5399493b570023':
  SensorManager API changes.
 2014-07-30 16:40:08 +00:00
Alan Viverette
65de1521af am d34d495f: am de583846: Merge "Enable hardware rendering for system process" into lmp-dev 
* commit 'd34d495f367e84b8a3e78eaa4acbfe3c4902a1f8':
  Enable hardware rendering for system process
 2014-07-30 16:40:04 +00:00
Jeff Sharkey
f9cc03e06b am a3a9bf36: am 0be65699: Light icons for DocumentsUI. 
* commit 'a3a9bf36191a51c02172167246fa8aebf172e5c5':
  Light icons for DocumentsUI.
 2014-07-30 16:39:57 +00:00
Sandeep Siddhartha
514af2c236 am e444b911: am 5b02e931: Notify VIS of shutdown before switching implementations 
* commit 'e444b91104d8b9a0d5de63d7523e6aeb5e2a73fa':
  Notify VIS of shutdown before switching implementations
 2014-07-30 16:39:45 +00:00
Tyler Gunn
727c700603 am edeba32e: am c5d8facb: Adding video width/height to camera capabilities. 
* commit 'edeba32e40a32fd2a16b05e4797801f8a104bf68':
  Adding video width/height to camera capabilities.
 2014-07-30 16:39:40 +00:00
Jeff Sharkey
07ca771d87 am 38ba25de: am fa939303: Latest DocumentsUI material asset drop. 
* commit '38ba25de1a278aa7db57f4ee16e2691b44e98a06':
  Latest DocumentsUI material asset drop.
 2014-07-30 16:39:36 +00:00
Ye Wen
d6301cc18b am 1b16479a: am 76f285ee: Merge "Implement broker pattern for imms (1/3)" into lmp-dev 
* commit '1b16479a79442438747ebbaf674c37f83dbdda8c':
  Implement broker pattern for imms (1/3)
 2014-07-30 16:39:32 +00:00
Wei Wang
9e2fc3c71f am 53be8d6a: am e95a450e: Merge "Make scan filter accepts prefix. Add tests." into lmp-dev 
* commit '53be8d6ae0fad6b274c5aa91a2aa97783964f948':
  Make scan filter accepts prefix. Add tests.
 2014-07-30 16:39:27 +00:00
Amith Yamasani
5cd4e03465 am 8d072bf2: am e257f1ee: Set profile owner via an intent 
* commit '8d072bf22740082bc328624d0a7b4c8dbc75936b':
  Set profile owner via an intent
 2014-07-30 16:39:22 +00:00
Jeff Davidson
1a7d51ea50 am c6ddb55c: am 9f920587: Merge "Don\'t request network scores before boot completes." into lmp-dev 
* commit 'c6ddb55cdb8af7fb0b626728078828e1d9599158':
  Don't request network scores before boot completes.
 2014-07-30 16:39:12 +00:00
Amith Yamasani
2623b6972f am db231902: am 711c40a2: Merge "Potential fix for apps disappearing in launcher on system server crash" into lmp-dev 
* commit 'db2319027dd17a8c5980732b7b930706d8a8d6c2':
  Potential fix for apps disappearing in launcher on system server crash
 2014-07-30 16:39:07 +00:00
Eino-Ville Talvala
b565d999cf am 5496085d: am c02b64b6: Camera2: API review updates 
* commit '5496085d413b3ea12a2cd6e4531c3f95b41ed86d':
  Camera2: API review updates
 2014-07-30 16:38:56 +00:00
Ying Wang
f9cf34b9b5 am 1ebafced: am d9789353: Merge "Fix docs build." into lmp-dev 
* commit '1ebafced52112db8ea77fc7221d74ec4b8547a6c':
  Fix docs build.
 2014-07-30 16:38:50 +00:00
Craig Mautner
86af0d0245 am 34a2d92a: am 6b3bade6: Eliminate memory leak in TaskPersister 
* commit '34a2d92a5cef8d5ee2cf7536e5cfccba83850ae7':
  Eliminate memory leak in TaskPersister
 2014-07-30 16:38:44 +00:00
Jeff Sharkey
24acf815b7 am 7e0e1d01: am c3214d18: More DocumentsUI material iteration. 
* commit '7e0e1d01476f2a4e6f5451da177846bda41a0607':
  More DocumentsUI material iteration.
 2014-07-30 16:38:39 +00:00
Jeff Davidson
3b97984410 am bf7b7ee0: am ebc1f37f: Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev 
* commit 'bf7b7ee09adbd13fc37a8c8d41b53e1bc1158f7c':
  Add NetworkScoreManager.disableScoring().
 2014-07-30 16:38:19 +00:00
Jinsuk Kim
c9edca0989 am 0c7ef24c: am 8b964025: Invoke input change listener at path change 
* commit '0c7ef24cf451278caeb3cb9fc97d7752e4393438':
  Invoke input change listener at path change
 2014-07-30 16:38:15 +00:00
Yuncheol Heo
fd83bb3667 am cd29acf7: am 6fa5476a: Make it pass CECT 11.1.3 System standby 
* commit 'cd29acf734eeba8237799da1b844edb404efeef0':
  Make it pass CECT 11.1.3 System standby
 2014-07-30 16:38:10 +00:00
riddle_hsu
1df4d9f8c7 [ActivityManager] Avoid mistaking visibility by finishing task. 
Sympton:
Next activity only adds to history but does not launch/resume then results ANR.

Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.

Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
            // If starting in an existing task, find where that is...
            boolean startIt = true;
            for (int i = NH-1; i >= 0; i--) {
                ActivityRecord p = mHistory.get(i);
                if (p.finishing) { // <--
                    continue;
                }

Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee
 2014-07-31 00:26:51 +08:00
Geoff Mendal
f62af27846 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
aa31e475d2 Import translations. DO NOT MERGE 
Change-Id: Iac3087ace0ea7c351d1606f37000bfa134249184
Auto-generated-cl: translation import
 2014-07-30 12:36:23 -07:00
Geoff Mendal
92725af936 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
6a85959838 Import translations. DO NOT MERGE 
Change-Id: I548370fd62b7a26852d16ddbd22ef67ea6369080
Auto-generated-cl: translation import
 2014-07-30 12:20:32 -07:00
Geoff Mendal
4dfd455d49 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
e061d44997 Import translations. DO NOT MERGE 
Change-Id: Ie02a99d4e746803f482713fe8a35ef31fdb5fdcb
Auto-generated-cl: translation import
 2014-07-30 11:04:05 -07:00
Joe Fernandez
b83127f0cf Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 2014-07-30 16:17:51 +00:00
Joe Fernandez
0d568c98c1 docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ 
Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece
 2014-07-30 10:10:19 -07:00
Alan Lau
06a8455421 Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
7ab1900a5a Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying"" 
This reverts commit af60e56b39582ea90ccd7601cd06350a50bf6500.

Change-Id: I1aa698608773b9e540457831e11218f371c71268
 2014-07-30 17:35:29 +00:00
Geoff Mendal
b55853e8a3 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
bead503b15 Import translations. DO NOT MERGE 
Change-Id: Iec046e9a3d34bef3d8055f3eb00e243baf69c8fa
Auto-generated-cl: translation import
 2014-07-30 10:40:00 -07:00
Alan Lau
c006227265 Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
273906bb6a Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator"" 
This reverts commit 77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.

Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
 2014-07-30 17:30:15 +00:00
Chris Wren
b0d07db5ce am 6d23f4fd: Merge "Add a log and statistics for notification expansion." into lmp-dev 
* commit '6d23f4fdbe2c191000628e963d14fa8288a06d12':
  Add a log and statistics for notification expansion.
 2014-07-30 15:36:54 +00:00
Robin Lee
6a41c8c43a am e6818f08: Merge "Don\'t turn off screen after wiping user profiles" into lmp-dev 
* commit 'e6818f08d6d052bdb7d13effd22c32218e15d95d':
  Don't turn off screen after wiping user profiles
 2014-07-30 15:19:35 +00:00
PauloftheWest
fd2c6b468f am e33e0512: Fixed a bug where Bluetooth was turned on with the drop-down in quick settings. 
* commit 'e33e0512b0c53f386112777057dbf332927e3688':
  Fixed a bug where Bluetooth was turned on with the drop-down in quick settings.
 2014-07-30 15:14:29 +00:00
Jorim Jaggi
3fe5ea3e78 am e8404d19: Implement nice header transition when opening QS 
* commit 'e8404d1948a9e449e82a7c3bd57ee264f9b02f2b':
  Implement nice header transition when opening QS
 2014-07-30 15:10:07 +00:00
PauloftheWest
64fe15846c Fixed a bug where Bluetooth was turned on with the drop-down in quick settings. 
Bug: 16547579

Change-Id: I3326aa1f4076d46dc0f8f87f14b44f097e684105
 2014-07-30 15:08:10 +00:00
Jorim Jaggi
90e0df291f Implement nice header transition when opening QS 
Bug: 15192264
Change-Id: Id7d67d6067882982e2ca195e257dfa1b73db2cf6
 2014-07-30 15:05:00 +00:00
Nicolas Prevot
807543b9bf am 43586171: Removing old tag TAG_FORWARDING_INTENT_FILTERS. 
* commit '435861715059c79ab4459ecedb0908ffc8c12878':
  Removing old tag TAG_FORWARDING_INTENT_FILTERS.
 2014-07-30 14:30:26 +00:00
Nicolas Prevot
f288907d05 am 4bb6ae67: Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev 
* commit '4bb6ae67b08ad4d0d508c269e97ae4d1c7be0e79':
  Fixing a NullPointerException in isProfileOwnerApp.
 2014-07-30 14:30:22 +00:00
Christoph Studer
fa00735f92 am 6d28d0cc: NoListener: Optimize RankingMap 
* commit '6d28d0cc4e0fe97fd7841f402766d38e29a739cc':
  NoListener: Optimize RankingMap
 2014-07-30 14:30:16 +00:00
Kenny Guy
9804485717 am 7d31e8dc: Merge "Add optional handler to LauncherApps callback" into lmp-dev 
* commit '7d31e8dc1469e0768bd5fcd856275238950fc589':
  Add optional handler to LauncherApps callback
 2014-07-30 14:30:12 +00:00
Christoph Studer
f89cb25366 am 64130a59: Notification: Forward setUser() call to publicVersion 
* commit '64130a59d2fbc7175a846c0e38be7534b413e25b':
  Notification: Forward setUser() call to publicVersion
 2014-07-30 14:30:08 +00:00