Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,707 Commits 3 Branches 0 Tags
e3512894afbdc0f28b67e021edb76d0c5d13c2f7
Commit Graph

240707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohei Yukawa
e3512894af Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 
am: d67a1ca49b

* commit 'd67a1ca49b138056d53490322ffdadef61d95fec':
  Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I59093644b6bb6f9b6573f28fb501d28f736f1972
 2016-04-21 17:16:15 +00:00
Chris Craik
ef79274692 Merge "Fix shadow radius too large for RS" into nyc-dev 
am: 924d8227c4

* commit '924d8227c4c790f05fb90d6140de15fa8abb704b':
  Fix shadow radius too large for RS

Change-Id: I165e946b30e47ba711efb23996ec9d08b0043310
 2016-04-21 17:16:14 +00:00
Yohei Yukawa
d67a1ca49b Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 2016-04-21 17:11:55 +00:00
Chris Craik
924d8227c4 Merge "Fix shadow radius too large for RS" into nyc-dev 2016-04-21 17:09:03 +00:00
Jaewan Kim
552c5af941 Merge "PIP: Fix system UI crash" into nyc-dev 
am: 28d9c9f7b2

* commit '28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
  PIP: Fix system UI crash

Change-Id: Ief778c79108ac6d2eb5e7b2406f9c6d1da6c8ca7
 2016-04-21 16:31:42 +00:00
Youngsang Cho
28d9c9f7b2 Merge "PIP: Fix system UI crash" into nyc-dev 2016-04-21 16:23:01 +00:00
Tony Mak
c3bd9dc93f Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev 
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: I9de441cca7574620fb3917adddbd911a8a935854
 2016-04-21 15:56:06 +00:00
Julia Reynolds
49ac59197a Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev 
am: 54a6394cf9

* commit '54a6394cf96423936e6f3548ed8d78ff82e6b247':
  Accept the calendar name in addition to the owner as a calendar filter.

Change-Id: Id788bb4465b947d6b5515a3c1d560c337ea5c382
 2016-04-21 15:56:04 +00:00
Tony Mak
d3589ee715 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev 2016-04-21 15:51:14 +00:00
Tony Mak
646fe9913e Fix wrong app is launched after solving challenge from tapping notification 
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964
 2016-04-21 16:43:08 +01:00
Julia Reynolds
54a6394cf9 Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev 2016-04-21 15:36:31 +00:00
Julia Reynolds
f581bc8399 Merge "Always reevaluate rules when a new service is added." into nyc-dev 
am: a8574a1dfa

* commit 'a8574a1dfaa45089d392ebf05a8a82e4d8a1d82e':
  Always reevaluate rules when a new service is added.

Change-Id: Ia9098705c487402bd987a1b55aec69a58fc67780
 2016-04-21 15:31:47 +00:00
Keith Cheung
b21712eceb Merge "Include work app in battery optimization settings" into nyc-dev 
am: 39066abb59

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
  Include work app in battery optimization settings

Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82
 2016-04-21 15:31:46 +00:00
Julia Reynolds
a8574a1dfa Merge "Always reevaluate rules when a new service is added." into nyc-dev 2016-04-21 15:24:05 +00:00
Julia Reynolds
bdfd3c836f Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev 
am: d0f2d1f9ac

* commit 'd0f2d1f9ace01c4e0581baa3f5eb0a694afca675':
  Don't call into audiomanager holding a zen lock.

Change-Id: I8a7eee3478bca5d8bfd1262e68d136b58fda4884
 2016-04-21 15:18:12 +00:00
Keith Cheung
39066abb59 Merge "Include work app in battery optimization settings" into nyc-dev 2016-04-21 15:18:08 +00:00
Julia Reynolds
d0f2d1f9ac Merge "Don't call into audiomanager holding a zen lock." into nyc-dev 2016-04-21 15:04:07 +00:00
Clara Bayarri
b91447b4e4 Merge "Reinflate QS view on Locale configuration change" into nyc-dev 
am: 98c7c05dde

* commit '98c7c05dde8c288a4eab680af31b030813b8c87f':
  Reinflate QS view on Locale configuration change

Change-Id: Ie27dce5dcd654771580d8295cca202a23954278b
 2016-04-21 14:53:11 +00:00
Clara Bayarri
98c7c05dde Merge "Reinflate QS view on Locale configuration change" into nyc-dev 2016-04-21 14:47:16 +00:00
Julia Reynolds
8f7872a3d3 Merge "Volume updates should appear continuous when changed by touch." into nyc-dev 
am: db042644d5

* commit 'db042644d5f724d1c21c2ddd424de70aaf0d4195':
  Volume updates should appear continuous when changed by touch.

Change-Id: I56e41e7af655547b32f230951a5e978cb59f96fd
 2016-04-21 14:46:16 +00:00
Clara Bayarri
d9603ecbe2 Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev 
am: bcedd6b74f

* commit 'bcedd6b74f717dddb2e3e37385d1b4a4e82d949a':
  Fix silent errors when launching Keyboard Shortcuts from Settings

Change-Id: I43938e09b83271cf48ddfe6bb6f956332f415c18
 2016-04-21 14:44:04 +00:00
Julia Reynolds
7c9350a940 Always reevaluate rules when a new service is added. 
Otherwise the condition providers may never get an
onSubscribe call and may not turn on at the right time.

Bug: 26981870
Change-Id: Ia622597f10cc26f7c34ece1748013655543f488f
 2016-04-21 10:38:32 -04:00
Julia Reynolds
d82e981cf3 Don't call into audiomanager holding a zen lock. 
Bug: 27642196
Change-Id: Ib510f2ddf966f36b3670290a4f3f695bf6b7810e
 2016-04-21 10:38:32 -04:00
TreeHugger Robot
db042644d5 Merge "Volume updates should appear continuous when changed by touch." into nyc-dev 2016-04-21 14:33:50 +00:00
Clara Bayarri
bcedd6b74f Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev 2016-04-21 14:28:58 +00:00
Paul Jensen
861d45b5e1 Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev 
am: 3f45105353

* commit '3f4510535397bf103d0299440a0299ff8bbeec28':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: I194acabb1f9e301d88a40af8ea1d088a3d2ec0d9
 2016-04-21 13:55:25 +00:00
Paul Jensen
3f45105353 Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev 2016-04-21 13:47:13 +00:00
Clara Bayarri
9b1fdff2e7 Reinflate QS view on Locale configuration change 
The existing DensityContainer already did this for density changes,
repurposed it to handle other Configuration changes. Also renamed
to AutoReinflateContainer.

Bug: 27952059
Change-Id: Ieb572abcbafe49aec73b16e1bcb8c294011afdd3
 2016-04-21 14:32:07 +01:00
Clara Bayarri
c043ebee4b Fix silent errors when launching Keyboard Shortcuts from Settings 
The following error was thrown, given that Activity is generating a
protected broadcast:
Sending non-protected broadcast
android.intent.action.SHOW_KEYBOARD_SHORTCUTS from system

Bug: 28138503
Change-Id: I50d5212d7776d33ffe6e9df1c5f080205ac4a29d
 2016-04-21 11:55:01 +01:00
Jaewan Kim
fe6f335b63 PIP: Fix system UI crash 
Bug: 28306480
Change-Id: Ie36f73c46f3ee8d6a2cb8264458cb0e0410aaecd
 2016-04-21 16:22:48 +09:00
Erik Kline
50f963f022 Merge "Expand NetworkMonitor metrics" into nyc-dev 
am: b99d6af3ab

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
  Expand NetworkMonitor metrics

Change-Id: I6fad2c6fa68c42d161f90abedf83624379b48c8d
 2016-04-21 05:28:28 +00:00
TreeHugger Robot
b99d6af3ab Merge "Expand NetworkMonitor metrics" into nyc-dev 2016-04-21 05:24:40 +00:00
Hugo Benichi
eb8372d38c Merge "Some fixes in ConnectivityService event logging" into nyc-dev 
am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: Id07df8b694cab22baaa2f9ba849f03bafb9b5590
 2016-04-21 04:12:53 +00:00
Hugo Benichi
27656e0352 Merge "Various fixes in IpReachability event logging" into nyc-dev 
am: 75f0346167

* commit '75f0346167f9b8beb8d4b941e7a4ca8228e0737a':
  Various fixes in IpReachability event logging

Change-Id: Ia20b9ef1a949b6474a5e09b096e6d34e41f316aa
 2016-04-21 04:03:58 +00:00
Hugo Benichi
7261fb27de Merge "Some fixes in ConnectivityService event logging" into nyc-dev 2016-04-21 04:02:55 +00:00
Erik Kline
a488c23dd5 Expand NetworkMonitor metrics 
- add netid to CaptivePortalStateChangeEvent
    - add NetworkMonitorEvent for simple duration measurements

Bug: 28204408
Change-Id: I62035e07d64013878a0bce30c67c929c2c7e7a85
 2016-04-21 13:02:55 +09:00
Hugo Benichi
75f0346167 Merge "Various fixes in IpReachability event logging" into nyc-dev 2016-04-21 03:54:18 +00:00
Felipe Leme
cf63c62a0a Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev 
am: 333e808b34

* commit '333e808b34397258457813b6d7d970da72e76925':
  Removed obsolete screenshot mention from full bugreport.

Change-Id: I28e2617e7ee6efeeea025120637794584cdfd42d
 2016-04-21 03:44:13 +00:00
TreeHugger Robot
333e808b34 Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev 2016-04-21 03:34:46 +00:00
Adrian Roos
8047bed6a3 Merge "Remove obsolete TODO" into nyc-dev 
am: 568e63bc9b

* commit '568e63bc9b53537505016f41e48e908c4da863e5':
  Remove obsolete TODO

Change-Id: Iaf25259e51d0f4b69d58dc918033299e88aab124
 2016-04-21 03:26:03 +00:00
Tomasz Mikolajewski
caad05bf83 Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev 
am: 69e3618f07

* commit '69e3618f07be6f48bfc37c52e6ef5830f717b495':
  Do not make files in zip disabled in ACTION_VIEW.

Change-Id: I6c4749738e1bc6116e4e56c494932a62d2c16ac9
 2016-04-21 03:26:01 +00:00
TreeHugger Robot
568e63bc9b Merge "Remove obsolete TODO" into nyc-dev 2016-04-21 03:18:48 +00:00
Tomasz Mikolajewski
69e3618f07 Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev 2016-04-21 03:17:03 +00:00
Ruchi Kandoi
dc84ddce39 Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev 
am: 316c68f144

* commit '316c68f144946a3019cc8f314921e8588c766b71':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: I591073412c162c14800475261936790da3c22ef5
 2016-04-21 02:46:49 +00:00
Ruchi Kandoi
316c68f144 Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev 2016-04-21 02:37:50 +00:00
Nathan Harold
795939499d Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev 
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: Id4fb225d71e33bbfdf57dd13278fc71b4cd40370
 2016-04-21 02:16:00 +00:00
Nathan Harold
f6496db8ce Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev 2016-04-21 02:09:28 +00:00
Hugo Benichi
5f16f760ad Some fixes in ConnectivityService event logging 
Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
 2016-04-21 11:03:08 +09:00
Phil Weaver
38b5d99620 Merge "Fix a11y key event handling from multiple devices." into nyc-dev 
am: 4b88bddb12

* commit '4b88bddb12a62ec2d791d45e5b995aab87666a7b':
  Fix a11y key event handling from multiple devices.

Change-Id: I8da38100a98ab902033cfc290858a8da13c97ccd
 2016-04-21 01:42:48 +00:00
Phil Weaver
4b88bddb12 Merge "Fix a11y key event handling from multiple devices." into nyc-dev 2016-04-21 01:38:49 +00:00