Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,218 Commits 3 Branches 0 Tags
b44ddbb5b341d3cc8206537b026c7cb433aa2cba
Commit Graph

252218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clara Bayarri
b44ddbb5b3 Merge "Add Tron logging for open/close App Disambig" into nyc-mr1-dev 
am: f4f15d582a

* commit 'f4f15d582a60b9324e4b1e4f3276f4cc4b2b0531':
  Add Tron logging for open/close App Disambig

Change-Id: I77ba68bc54cfa0a6b382adce4f1605196a07aab4
 2016-05-10 23:53:13 +00:00
Hans Boehm
f58e63b005 Merge "Clear more native pointers in finalizers" am: a5ca0ca886 am: 8521a8ff86 
am: 0024c91409

* commit '0024c91409ae7c137ede27d10f67331720cede43':
  Clear more native pointers in finalizers

Change-Id: I343282660f701962241c73683023b19fdc7c7f32
 2016-05-10 23:50:40 +00:00
TreeHugger Robot
f4f15d582a Merge "Add Tron logging for open/close App Disambig" into nyc-mr1-dev 2016-05-10 23:49:25 +00:00
Hans Boehm
0024c91409 Merge "Clear more native pointers in finalizers" am: a5ca0ca886 
am: 8521a8ff86

* commit '8521a8ff860e89ca60d530db60f58878847cf52a':
  Clear more native pointers in finalizers

Change-Id: Icca385cd603ad15ab02f2033f8652e3a8d2f6c3d
 2016-05-10 23:48:16 +00:00
Hans Boehm
8521a8ff86 Merge "Clear more native pointers in finalizers" 
am: a5ca0ca886

* commit 'a5ca0ca8860ac99eaa2ad7c959fd4e04d331153e':
  Clear more native pointers in finalizers

Change-Id: I5577b85c83da164c0cb4add151bab18cf1555c9a
 2016-05-10 23:45:34 +00:00
Android Build Merger (Role)
6f24e2ef81 Merge "Merge "TIF: Fix comments for program start/end times" into nyc-dev am: 281d96e238 am: 39f306f886" into nyc-mr1-dev-plus-aosp 2016-05-10 23:45:26 +00:00
Jae Seo
b5cbdd06af Merge "TIF: Fix comments for program start/end times" into nyc-dev am: 281d96e238 
am: 39f306f886

* commit '39f306f8868566a766b6967e2978ceb41edd6baf':

Change-Id: I618f845a49836899031ee479fe2020a6528a4b9c
 2016-05-10 23:45:06 +00:00
Android Build Merger (Role)
8b32fe246c Merge "Merge "TIF: Fix comments for program start/end times" into nyc-dev am: 281d96e238 am: 39f306f886" into nyc-mr1-dev-plus-aosp 2016-05-10 23:43:24 +00:00
Jae Seo
708ec4d382 Merge "TIF: Fix comments for program start/end times" into nyc-dev am: 281d96e238 
am: 39f306f886

* commit '39f306f8868566a766b6967e2978ceb41edd6baf':
  TIF: Fix comments for program start/end times

Change-Id: I0a411548615d63b2cad1a0772abdb3d12582a5a3
 2016-05-10 23:42:56 +00:00
Jae Seo
cc4bc867a7 Merge "TIF: Fix comments for program start/end times" into nyc-dev am: 281d96e238 
am: 421746e991

* commit '421746e99190fb64b8ca4d424a2bd7998b618278':
  TIF: Fix comments for program start/end times

Change-Id: I952706d7d66c871c4144da646a3098f3d634a569
 2016-05-10 23:42:53 +00:00
Hans Boehm
a5ca0ca886 Merge "Clear more native pointers in finalizers" 2016-05-10 23:41:31 +00:00
Jae Seo
421746e991 Merge "TIF: Fix comments for program start/end times" into nyc-dev 
am: 281d96e238

* commit '281d96e238ba53dba339df7ffde05cf1f46eb1b5':
  TIF: Fix comments for program start/end times

Change-Id: I7f3861a39ab465973c16543a5ae27dc5ed73b477
 2016-05-10 23:40:24 +00:00
Android Build Merger (Role)
d04c265382 Merge "Merge "Add WebView scroll activity to UiBench" into nyc-dev am: 597acb4d0b am: 80cb9b35ae" into nyc-mr1-dev-plus-aosp 2016-05-10 23:40:21 +00:00
Jae Seo
39f306f886 Merge "TIF: Fix comments for program start/end times" into nyc-dev 
am: 281d96e238

* commit '281d96e238ba53dba339df7ffde05cf1f46eb1b5':
  TIF: Fix comments for program start/end times

Change-Id: Ied59868e8aaa3e35f27b0e4b42bc67eb3b50208a
 2016-05-10 23:40:15 +00:00
Chris Craik
9b2c9fa651 Merge "Add WebView scroll activity to UiBench" into nyc-dev am: 597acb4d0b 
am: 80cb9b35ae

* commit '80cb9b35ae2461078372a3e5bc5b230caf63de75':

Change-Id: Icf2356bd03f52a4330531da900d225751fcd62ad
 2016-05-10 23:40:00 +00:00
Android Build Merger (Role)
8369c0c977 Merge "Merge "Add WebView scroll activity to UiBench" into nyc-dev am: 597acb4d0b am: 80cb9b35ae" into nyc-mr1-dev-plus-aosp 2016-05-10 23:38:02 +00:00
Chris Craik
1978f210eb Merge "Add WebView scroll activity to UiBench" into nyc-dev am: 597acb4d0b 
am: 99d5e0f84f

* commit '99d5e0f84ffcfcf349ec206fde3b29857fb81e89':
  Add WebView scroll activity to UiBench

Change-Id: Ifdacd3f35b20d4a01d14212275b43ea1a163019e
 2016-05-10 23:37:36 +00:00
Chris Craik
cf576a1104 Merge "Add WebView scroll activity to UiBench" into nyc-dev am: 597acb4d0b 
am: 80cb9b35ae

* commit '80cb9b35ae2461078372a3e5bc5b230caf63de75':
  Add WebView scroll activity to UiBench

Change-Id: Ie6694da25e90425d7ba69e22682b3abeb843fc84
 2016-05-10 23:37:33 +00:00
TreeHugger Robot
281d96e238 Merge "TIF: Fix comments for program start/end times" into nyc-dev 2016-05-10 23:36:43 +00:00
Chris Craik
80cb9b35ae Merge "Add WebView scroll activity to UiBench" into nyc-dev 
am: 597acb4d0b

* commit '597acb4d0b9bf06d4021dc7a7154675d64cebb7d':
  Add WebView scroll activity to UiBench

Change-Id: I1b075ec6fead8d77d3776d7ddcd5263625660c07
 2016-05-10 23:35:04 +00:00
Chris Craik
99d5e0f84f Merge "Add WebView scroll activity to UiBench" into nyc-dev 
am: 597acb4d0b

* commit '597acb4d0b9bf06d4021dc7a7154675d64cebb7d':
  Add WebView scroll activity to UiBench

Change-Id: I56695fb02fb9458b0560ca28c5817ebe6183bd87
 2016-05-10 23:35:01 +00:00
Chris Craik
597acb4d0b Merge "Add WebView scroll activity to UiBench" into nyc-dev 2016-05-10 23:31:22 +00:00
Android Build Merger (Role)
da57de1d60 Merge "Always update cached copy of authenticatorId. am: 967a9a12a7 am: 5e6b07e09e" into nyc-mr1-dev-plus-aosp 2016-05-10 23:27:28 +00:00
Jim Miller
0bfb000430 Always update cached copy of authenticatorId. am: 967a9a12a7 
am: 5e6b07e09e

* commit '5e6b07e09ebe7b50d2df79bb751786f38fe56549':

Change-Id: Ife7aadb693b7cebb9b1fa79dab3ab44dd548bf57
 2016-05-10 23:27:08 +00:00
Android Build Merger (Role)
3b894ae0f6 Merge "Always update cached copy of authenticatorId. am: 967a9a12a7 am: 5e6b07e09e" into nyc-mr1-dev-plus-aosp 2016-05-10 23:25:23 +00:00
Jim Miller
3dac29eb7b Always update cached copy of authenticatorId. am: 967a9a12a7 
am: f5e09f1a41

* commit 'f5e09f1a414850d594e9a4fd4ec3ae9d85efa17c':
  Always update cached copy of authenticatorId.

Change-Id: Ic41a6abdc189aad9491bda2cff045c0f212736ea
 2016-05-10 23:24:57 +00:00
Jim Miller
71f90d6442 Always update cached copy of authenticatorId. am: 967a9a12a7 
am: 5e6b07e09e

* commit '5e6b07e09ebe7b50d2df79bb751786f38fe56549':
  Always update cached copy of authenticatorId.

Change-Id: I516605a44f74510ef1a17d38f94b4b4c3bb22dfd
 2016-05-10 23:24:54 +00:00
Android Build Merger (Role)
733faf895d Merge "Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev am: fe03504cf1 am: f0666c7cb0" into nyc-mr1-dev-plus-aosp 2016-05-10 23:23:01 +00:00
Android Build Merger (Role)
788d2c2102 Merge "Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a822331 am: ea2e5bfdd2" into nyc-mr1-dev-plus-aosp 2016-05-10 23:22:52 +00:00
Selim Cinek
8abe8d113c Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev am: fe03504cf1 
am: f0666c7cb0

* commit 'f0666c7cb0c81ee4c5de13fdca0b8fca9b4f34d2':

Change-Id: Iacf1a3161317355ecb19d2cff55a73a5d8479f69
 2016-05-10 23:22:28 +00:00
Selim Cinek
cd689ba9d0 Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a822331 
am: ea2e5bfdd2

* commit 'ea2e5bfdd2f2d288e907131dad4de8376da46133':

Change-Id: I7137df96cb24951f187a7ef19921990bf47963dd
 2016-05-10 23:22:24 +00:00
Jim Miller
5e6b07e09e Always update cached copy of authenticatorId. 
am: 967a9a12a7

* commit '967a9a12a73b7c4b00badfecf4721dfa75e0abcf':
  Always update cached copy of authenticatorId.

Change-Id: I56ad8b3118711985c3fb5077820abe67edb2740b
 2016-05-10 23:22:04 +00:00
Jim Miller
f5e09f1a41 Always update cached copy of authenticatorId. 
am: 967a9a12a7

* commit '967a9a12a73b7c4b00badfecf4721dfa75e0abcf':
  Always update cached copy of authenticatorId.

Change-Id: Ibe3119f4e9a1150a16a74433bdf028e0b6adc304
 2016-05-10 23:22:01 +00:00
Android Build Merger (Role)
b7e1d78fa5 Merge "Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev am: fe03504cf1 am: f0666c7cb0" into nyc-mr1-dev-plus-aosp 2016-05-10 23:20:29 +00:00
Android Build Merger (Role)
6bc88d64a5 Merge "Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a822331 am: ea2e5bfdd2" into nyc-mr1-dev-plus-aosp 2016-05-10 23:20:20 +00:00
Selim Cinek
22c7b9420e Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev am: fe03504cf1 
am: f0666c7cb0

* commit 'f0666c7cb0c81ee4c5de13fdca0b8fca9b4f34d2':
  Fixed a bug where the content wasn't transforming in a group

Change-Id: I10ddc7c586e9d0f8157206992f6cfa5edc572e6c
 2016-05-10 23:19:43 +00:00
Selim Cinek
42829e0ca1 Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev am: fe03504cf1 
am: c71d4f84f3

* commit 'c71d4f84f3389744aa074bba534779eee36779e5':
  Fixed a bug where the content wasn't transforming in a group

Change-Id: Ibd7e450a5cd449ebefd1e0f0c75ef9e59f600070
 2016-05-10 23:19:39 +00:00
Selim Cinek
7a75221de2 Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a822331 
am: ea2e5bfdd2

* commit 'ea2e5bfdd2f2d288e907131dad4de8376da46133':
  Fixed a bug where the positioning on the lockscreen was wrong

Change-Id: I3ace6487358e9b509af4b3f930deb8a0684802f5
 2016-05-10 23:19:39 +00:00
Selim Cinek
0b62228803 Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a822331 
am: 6b6a0e7773

* commit '6b6a0e7773f1f55a04c91d8acb320ffe9de710f6':
  Fixed a bug where the positioning on the lockscreen was wrong

Change-Id: Id1561c532f2049cae908b1a0d06b6f67c8ab02b9
 2016-05-10 23:19:37 +00:00
Selim Cinek
c71d4f84f3 Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev 
am: fe03504cf1

* commit 'fe03504cf1904a955bd8bbcd26f9121d754f5fc0':
  Fixed a bug where the content wasn't transforming in a group

Change-Id: I793b9f59bf862c790c2c761c9a16aeef2c7e48cf
 2016-05-10 23:17:04 +00:00
Selim Cinek
f0666c7cb0 Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev 
am: fe03504cf1

* commit 'fe03504cf1904a955bd8bbcd26f9121d754f5fc0':
  Fixed a bug where the content wasn't transforming in a group

Change-Id: I689fa839a7bd489b65cc160bda659a46411668a8
 2016-05-10 23:17:01 +00:00
Selim Cinek
6b6a0e7773 Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev 
am: 549a822331

* commit '549a822331a522cabfb854b91b1cad5a0f7128ae':
  Fixed a bug where the positioning on the lockscreen was wrong

Change-Id: Iee0e3b108b1345c65d53a9d02a68e5f5c1f44de5
 2016-05-10 23:17:00 +00:00
Selim Cinek
ea2e5bfdd2 Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev 
am: 549a822331

* commit '549a822331a522cabfb854b91b1cad5a0f7128ae':
  Fixed a bug where the positioning on the lockscreen was wrong

Change-Id: Ia1a7619019069599fcde4f3002e44517bb7d4572
 2016-05-10 23:16:58 +00:00
Jim Miller
967a9a12a7 Always update cached copy of authenticatorId. 
This fixes a bug where the cached copy of authenticatorId
was incorrect immediately after enrolling a new fingerprint.
During enroll, the authenticatorId is changed and needs to be updated.
The fix is to always get the new authenticatorId when we
call setActiveGroup(), which happens during every new

Fixes bug 28606914

Change-Id: I8b2d3afe67b3677b6e4516a550d874d9c2e426cd
 2016-05-10 23:15:03 +00:00
Selim Cinek
fe03504cf1 Merge "Fixed a bug where the content wasn't transforming in a group" into nyc-dev 2016-05-10 23:14:01 +00:00
Selim Cinek
549a822331 Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev 2016-05-10 23:13:51 +00:00
Makoto Onuki
c9289b8053 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev 
am: 4a3b597f55

* commit '4a3b597f557ef900299202ef88a6e601c0629368':
  Refactoring ShortcutManager + bug fixes.

Change-Id: Ief3a0dd2c81a2343895a88d9049b48d19bac6ac1
 2016-05-10 23:07:02 +00:00
Makoto Onuki
4a3b597f55 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev 2016-05-10 23:02:49 +00:00
Android Build Merger (Role)
fe1fa463ce Merge "Merge "Fix density change bugs in SystemUI" into nyc-dev am: 67b98daaa4 am: 73bc3fe2d1" into nyc-mr1-dev-plus-aosp 2016-05-10 22:48:37 +00:00
Adrian Roos
a1b05cb6a4 Merge "Fix density change bugs in SystemUI" into nyc-dev am: 67b98daaa4 
am: 73bc3fe2d1

* commit '73bc3fe2d1cfeefe3642709c7cc2e87334e71e92':

Change-Id: Ib3713f2afff339f58ad5e206cd561db5dff074af
 2016-05-10 22:48:14 +00:00